Revert "PIE 2.0"

This reverts commit 07cee877b6a1e34cb69b8cbd9b96fc3e419a5fc7.