Revert "Refactored bounds logic."

This reverts commit 860250302d3d330882e7e242303befc9569137ac.