HTC Plans No More Bundling