Reverted controller changes from previous branch merge