revert base controller devise changes that broke everything