Revert "patching up to new HTC source (41e6c45)"

This reverts commit 71ccbed4e56f9b24a0c2d242eac8f6a4210b6a44.