This breaks camera pan and rotate controls

Revert "Miscellaneous touchups"

This reverts commit d95e1800e105f105e35ab252e3b44dac1f7a6867.