Merge change 20530

* changes:
  remove unused and confusing comment