Revert part of 05742521b959b665246f8865d7f8d3cb9488e67d am: 534f6e7891

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