Revert to older find() method