This fixes #8422.