Bug 15645: Remove the confusing wait var and use found instead