Revert couch_server changes added in revision 1156361 Leaving the tests however since it doesn't hurt.