Testing fixes for heroku.
Found problem! Reverting some changes.