Revert "Dileep,Anishek| 2311 | Optimizing datasender lookup"

This reverts commit fa0afc698e872b87fea2a215d2fd3ab338054f48.