revert " track my htc common "