Revert "Use more efficient feature look-up in ReferenceUtil"

This reverts commit 888d9a60c302d4519bf01f088d0c22b585cff675.

Reverted for security as this is too bug-prone for a RC build.

Change-Id: I4a3a949bbb6ddb69db1cc66d8cfd3147acc37272
2 files changed