am 9aaf01b9: am 793810f6: am 23aa34a7: Merge change I137dac6f into eclair

Merge commit '9aaf01b9d03e931c9d37858562ea47dbaf44a3be'

* commit '9aaf01b9d03e931c9d37858562ea47dbaf44a3be':
  backout a workaround that is not needed anymore