Revert "Clean up for PIE."

This reverts commit cc73d23cdfcd91fa63e86489b32c4caa0b54ac12.