While i386, x86_64 and Sparc64/OpenBSD still worked after
df70204d, Sparc32 and Sparc64 Linux hosts
broke.

Partially revert the commit: make the restored code conditional to
!CONFIG_USER_PIE.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>