MDL-40604 Fix 2 uses causing unit test failures