Merge "Remove obsolete comment and option." am: 26af653a84 am: 46ed877991
am: 6a71de732f

* commit '6a71de732f9b3a61ed4cfaaf5b900becb58238d2':
  Remove obsolete comment and option.