Revert "Only require controller macros in specs that need them"

This reverts commit a84fe70c3c1fc21ea54dcd7e18202def1e36fd2c.