Rolling back reformatting to minimize differences in files again