Revert "PIE: preparations for gap"

This reverts commit 24c342ceaa3c03e51d7a71dc9cba139f2a587a8e.