am efcaecab: Revert "service_contexts: don\'t delete intermediate on failure"

* commit 'efcaecab4eb075fdc69942e6915999458fb5f88b':
  Revert "service_contexts: don't delete intermediate on failure"