Fix for non-heroku upstreams