"NXP-12456: revert adapt wait and find according to new API"

This reverts commit 8d58acf4f0c8cbd702b2d17f12fbe54eebdc2b93.