Fixed in a different way in checkin [2386d26cfb].