This reverts commit 117e8b34. Reason for revert: Causes elf/tst-glibcelf and elf/tst-relro-* to fail on all architectures.