Revert "ROLL BACK POOP HEAP"

This reverts commit 87104b15c4b6a508b3b73a9ff094f6276581cb47.