[PATCH 1/2] Properly revert changes when cancelling Partition destruction