Was a regression from 2e5a4cb5ca. Fixes #6376. (cherry picked from commit eff6519aaf)
2e5a4cb5ca
eff6519aaf