Revert "More poptimizations"

This reverts commit 69dc3ca566005a215c34e248921c56de65991947.