Bug 887493 - Improve array find