Fixes #24875: Merged fix from 3.5.