[PATCH 1/5] server: revert b4a1d80ae35d35f5c170e101922bf1563488be18 for now