Temporary workaround to make squashed diffs work