Revert "Revert change to server."

This reverts commit b281f1af4580c57b7c348c66ca82686108dfd982.