Revert "Remove unneeded HTC things"

This reverts commit 03c42dfc638111e62da2272d413eb300ef29ddd6.