Merge revisit, which fixes 2.6