This fixes #15866, the original fix for which didn't merge cleanly to
the stable branch.