I think this is also starting to cause issues at Heroku too