Revert "Update by Kashif"

This reverts commit b2379f6f911a68c17f99edfa565022b5fed49fcd.