Revert "Replace deprecated AR dynamic finders."

This reverts commit 1093861eaf77cbf7df004594a6f58565ef2ee63a.