Merge change Ib839afc3 into eclair-mr2

* changes:
  remove the bind helper and bind directly