Merge change Ib097fbbf into eclair

* changes:
  DO NOT MERGE  Reverting change I53e91db7.