Fixes DEVELOPER-748

I think, anyway. Local testing is inconclusive.