See if this fixes sporadic test failures.

STUD-1040