Switching to the simpler diff implementation for the time being.