Is diffusivity actually doing anything here? It seems like we get perfectly fine behavior without tweaking it.  If it turns out we need it later we can add it back, but for the time being it's an adjustment knob that we aren't using in a highly perfomance-critical piece of code.