Revert "service_contexts: don't delete intermediate on failure"

This reverts commit f6ee7a521942036ef7f5c0f6bc74520509934141.

Change-Id: I4f1396e6e4aeecd1109f9c24494c6e82645c0663
1 file changed