Revert "Fix some bugs with Thomas controls"

This reverts commit 460f8549473dc2055e4945a49f33260447a69ef2.