Revert "Add Reverse lookup [4/4]"

This reverts commit e8fb1eebe853a5e9a51e29d354ff58a491858f15.

Change-Id: Ieb9dcfcf4542442f7cbf30f46679bdace2353e94