Forward port of issue #13596 to 6.2.x.

Comment From: sjohnr

I believe this was closed with 6ee4bbcc13ff6edec6358dcec3e692b4e8df4af8 in 6.2.0-M2.