Revert "Server upgrade"

This reverts commit 83393723fbb98899f26d996fa45a416e06effa24.