Tahi-project/tahi — pull request #666 by neo-tahi (2014-12-01 17:26:24+00:00)
Title: Revert "Staging environment fixes"

Reverts Tahi-project/tahi#656

I'm reverting until I can push this to staging directly.