Revert ab79a0a..b68964d

This rolls back to commit ab79a0afff901acfa78fa73ab4cd5eb9fdd5ff59.
New Server finished, untested...