Heroku fails again, now branching on heroku feature