Rearrange to attempt to debug a Heroku issue