Revert "controller update"

This reverts commit 0c8396b8d940cc967810d9d0b067aafaa771ad13.
Revert "controller fix"

This reverts commit ef1a2fb403c9f306b7a7556aa19e4be4926f3ac7.