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

* commit '46ed877991a08087fc7c5d75e8615e81290ede38':
  Remove obsolete comment and option.