Revert all the heroku hacks
This reverts commits 71050c9 f80d26b c130e34 f6cbf2d d7c806d 87f83c0 efcfe5f d2eacc2