Revert "PIE 2.0 - (1/2)"

This reverts commit 0085c7bc3f8f039b4ce6bbe62bd6c9d763cffd4a.