This reverts commit 73d1722d4b5c545ec488c5eb2119dd8b9b155363.
This sets up base behaviour for our servers