refs #561, manually backport SERVER-5208