Latest attempt to fix commit diffs.