Merge change 21648 into eclair

* changes:
  Remove the hack to include Gears as it is gone now.