Revert "Heroku fixes"

This reverts commit 455639147c9fbd7ae58fb6c7c9161eff1d80c64f.
More Heroku Fixes