SERVER-11241: remove unrelated stuff from prev commit