Revert "Update For New Server Gen"

This reverts commit 5222c99c316d1e9b4e1d4e6cb4fb59cb6029242e.
We aint doing that anymore
Revert "We aint doing that anymore"

This reverts commit 73686f43e02390ba33be6abd1c80a5cd79f1a897.