am 944ea1a3: Merge "Clean up abort."

* commit '944ea1a32018c44d6cb55c9454e670b0e152da6d':
  Clean up abort.