Reapply the non-accidental changes in “fix some markup”.