Roll back to using diff for now.