SERVER-24. Update for new class structure