Revert "Ajay | #3870 | Optimzied view usage"

This reverts commit 4cbf7089b2d315afdefc2f415211c79ed2af5114.