Revert "Update controllers"

This reverts commit 80dbe0b6294bb670ab00cf49fb0bbc841d3d6f31.