Revert part of 05742521b959b665246f8865d7f8d3cb9488e67d am: 534f6e7891 am: f7d8cfeee8

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