am 225400f7: Merge "Unconditional delete"

* commit '225400f7105aeca727b0884587715835d05c947a':
  Unconditional delete