reverted changes to controller_override that snuck in