Merge change I4499ad72 into eclair

* changes:
  Fix bad merge fixes build breakage.