Merge change I66057b1f into eclair

* changes:
  Whoops, these shouldn't be public.