Revert "Controller has changed."

This reverts commit cfe2ed14dea6e07a78d7d64ce7ced910cd0831c6.