Merge change I7c66eb48 into eclair-mr2

* changes:
  Remove an unused and inconvenient import statement.