Revert HTC Leo commits