This fixes #8336.