Fix regressions in regress1 after #4613. (#4616)