This fixes #8270.