ccdeb428
* commit 'ccdeb428ef541bab1bbc6ee3e33c4fb6ccbec42a': Avoid inconsistent state when remove fails.