Reverting back hmc driver changes.Needs testing