Revert "Flag adjusted in controller"

This reverts commit 37c37280c15cba45743f4f81ea836bf793a001a4.