Bring back HTC legacy support