Merge change I4b3db907 into eclair

* changes:
  Revert the channge where channels were not selected randomly.