am 88cec86e: Remove STOPSHIP and defer removal.

* commit '88cec86e882e27a9e35315553cc05fdf7f281a4e':
  Remove STOPSHIP and defer removal.