Merge change Ie944f08b into eclair

* changes:
  Revert setDataEnabled to setting a master switch.