Fix #8677 (fallout from #8180)