misc: Disable HTC modifications

Change-Id: Icde1b23ee0d34bae5b5a8b5c5ffc8532656d4ae8