Remove some HSIC changes made by HTC