refs #561, manually backport SERVER-8235