See gh-19200