Commenting out code which is causing test-failure for temporary time.<Jaideep>