This reverts commit db4b45b5c26c50c7b883d0f96b2a9a5136f26b58.
This sets up base behaviour for our servers