Revert latest mdss changes from CM