This fixes #8198.