Merge change I2782ac8c into eclair

* changes:
  Fix regression.