improved collision but sketchy gravity
Revert "improved collision but sketchy gravity"

This reverts commit c9c506ed579862379d862ecba68025035b8f2279.