Drop monkey patch now we're using option style redirects