Revert "Add Reverse lookup [2/4]"

This reverts commit ea7c9a109e9fc9a732c41e686f06993d3773c0b9.

Change-Id: I79973fc035503952e8f0d5bbc70137550f872436