Stable implementation for latest Heroku repository