Revert "service startup scan fix"
Merge pull request #245 from google/revert-243-service_startup_scan_fix

Revert "service startup scan fix"