I think this is a good idea anyway, but it's especially important here since otherwise the Save All tests would hit #4484