Revert 7023d27..d7c6a4f

This rolls back to commit 7023d27577e853666970d6edcb5d353c7399f3b4.
Successful collision boxes