Revert "Return PIE behaviour to previous state."

This reverts commit c8facad6b3775eaa91849f4a51f72133b4c28d48.