Revert part of 79eb7ba87bedd88fffa62a13ea9399c2affa1573 am: fd99009c52 am: bab750adfe

Change-Id: Ib050674547f74e47fc08092cdf9a1c53d4853b8d
tree: 83b8ccecc3e5629f5d35bb03817df4950fad55bc
  1. service-t/
  2. tests/