revert changes related to SERVER-10039

they caused some unexpected test failures, see #439