A little more shuffling for heroku. blegh.