Revert "Physics changes"

This reverts commit 71e15d7e58f77c6cc2a11f90a50219846e4bee4b.