Revert "PIE: preparations for gap"

This reverts commit 3f1ec766095d86ae2ed62f798bbfc84bb3d5f5fd.