Revert "Controller Extends update"

This reverts commit dea29264c50e423b38049d5b91065177cdc7940e.