Revert "Server commit"

This reverts commit d0784444bd90a20e04f082fcddd44196194b79a8.