have to walk the full list all the time.

This is a minimal fix for backporting to 4.1.x

Fixes:	#1798
Fixes:	#1788