This reverts commit 2f599ffd6d757bc98ac862836110c7b32cda3c51.
This sets up base behaviour for our servers