Revert "Switch to "real server""

This reverts commit c577ab9d879d567abf7cf88c1dd7833802bd326c.
Cleaning up initial commit