Revert "Upgrade to server"

This reverts commit 9ef2a1fba06aae0e2844c7d77dc9996ec9ce597b.