switching to python-based diff for now