Fix regressions introduced by fixes for issue #27083.
5 files changed