Revert "Server Change"

This reverts commit c632332e3c61c727da23b5b1eb65332003255977.