Revert "PIE 2.0 - (2/2)"

This reverts commit f439d64f1b112f0dae19394f0e7df3acd51ff0cc.