Merge change 21728 into eclair

* changes:
  removing old gears code and correcting simple method typo