Revert "ControllerFinal"

This reverts commit 35190b2eaee2fd322bc204f3b96a3bdf532dbe4c.