On his behalf, revert Kala's commits.
Revert test server commits 56493 and 56494
This reverts commit 12a020b263aaafa9240b00a71767d95dec49046b, reversing
changes made to c4ba068409eef69b385f04b04b8b5ab322aada8c.
It also reverts commit 199441208b2b2f2, which effectively duplicates
12a020b263aaafa9240b00a71 (1994412 is a merge commit of two merge
commits, each of which merge the same two commits).