Merge "Remove obsolete comment and option."
am: 26af653a84

* commit '26af653a84c83632d23dd2a06d1f31a7c6d5f84e':
  Remove obsolete comment and option.