Rolled back failed bugfix

Reverted my failed attempt at fixing the collider positions, so Wil can fix it correctly.