Re-added code to avoid calling buggy svc_run
Re-added code to avoid calling buggy svc_run

cmusatyalab/opendiamond,cmusatyalab/opendiamond,cmusatyalab/opendiamond,cmusatyalab/opendiamond,cmusatyalab/opendiamond