Applying previous fix to regrtest.