issue #20154: Don't break stuff.