Merge change I137dac6f into eclair

* changes:
  backout a workaround that is not needed anymore