am cd00b57f: Merge "Avoid some recursive aborting."

* commit 'cd00b57f40da1a821c5dd3cb7000aa597dab61fc':
  Avoid some recursive aborting.