Revert "Server update 3"

This reverts commit 50e74851ea8acb7e0d6643e16f712c3e0c210f28.
Server update