Revert "Merge pull request #20302 from spacekitteh/patch-10"

This reverts commit e02173c7, reversing
changes made to c2b4a0d2.

Breaks all grsec packages; Not having binary substitutes for no good
reason is disruptive to my workflow, so I'll just revert this for now.