Revert "Add Reverse lookup [3/4]"

This reverts commit f562b13da04641e670da611235aee7b6ac3a2178.

Change-Id: I9cfbcb7dc11138b50ba92192acaca13e780827f3