Fixes failing tests in server.

Reverts 33725b268d8a7a024d55e2a65b3a338b488e6824