This fixes #8149.