This fixes #8357.