Revert "Staging environment fixes"

Reverts Tahi-project/tahi#656

I'm reverting until I can push this to staging directly.