Make it work for OmniAuth + other stuff.