issue #20935: More code reversion.