SERVER-15535 revert aggressive test timing changes