This fixes #8403.