Revert "hcm's fixes"