Fixing even more x2 git shenanigans