Fix 920322 a different way, without recursion.