This fixes #8379.