Go back to using diff