am eb34b45e: Revert "fixing build"

Merge commit 'eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd' into eclair-mr2

* commit 'eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd':
  Revert "fixing build"