am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair

Merge commit '9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-mr2

* commit '9ae9763b7e5dd872619b13c889b72b0df176f956':
  DO NOT MERGE  Reverting change I53e91db7.
tree: 32efc48f558810b9174d819858017eb13f8b5dff
  1. core/
  2. services/