Fix SERVER-10332 for Andy