Fix my weird commit on Controller
Revert "Fix my weird commit on Controller"

This reverts commit 99fe1afbc60be6116ec01faea482ef3d1876b8b3.