This reverts commit 8cf0752f1bde487b7b78c6f375d22181023e32c2.
This reverts commit af3057423c2951d7a1652cf7383b2fafe12872b6.
This change fixed one package, and broke everything else. Please find a
proper fix and actually test it before committing.
Fixes #12909