Merge change I31c52bef into eclair

* changes:
  Revert change incorrectly submitted as part of change #32153.