Stuff
Revert "Stuff"

This reverts commit b8bbb66cfb9cc89ed1f6ab89cf98751e6104da88.
Revert "Revert "Stuff""

This reverts commit 57efbcf0e20a9c19a4c3b2325e3dbbdd1f7250df.
Fix hosting tests