Fix weird load-order problem on Heroku