Forward port of issue #21908 to 2.4.x.