Revert "Fix some stuff in controller (but not all)"

This reverts commit fbced7771bae3ce5dd1913abea4324264bbe6173.