Revert "Loop boundaries"

This reverts commit c4a0c5f9f7d20af50319dfb10fa880c447c835bb.