Fix extremely critically bad rebasing conflict for mongod 2.4.0