This fixes #8376.