Merged fix for Heroku revision.