revert changes related to SERVER-10039

see #439