Remove @patch now that we can inject the environment