Try and fix diff breakage here too.