Revert "Added a few fixes for PIE"

This reverts commit 7eb8626d859e86f340089a8c9b47a9648ad64f1b.