Merge change 22695 into eclair

* changes:
  Remove bogus comments and logging.