Heroku Workaround (screw you, Heroku!)