am d7f008f7: am 0f1b1f35: am 9eb6c874: Revert "property_contexts: don\'t delete intermediate on failure" * commit 'd7f008f7': Revert "property_contexts: don't delete intermediate on failure"