Undo md_apply_fix3 changes