server: revert commit 7e6556b3cad8