CFY-749 revert feature branch for rest client