Revert "GPSERVICES-mohsin1122"

This reverts commit ff8d6abb4f6d7f7b2fcd3634c0bc25460fda11b0.