Revert "[#3012] Some controller fixes"

This reverts commit c9825cec1b617c9af40a3bede7ef9810f43cf1ec.

wrong branch