Revert "Merge branch 'Physics'"

This reverts commit b3c5562c4cde4afcc6232e94de79b7b5b5197a06, reversing
changes made to c759763d913e2864f7616534ddd32d9f0882d17a.