Revert some server changes