Damnit! I guess I missed this when I fixed to 10,000-th merge conflict while trying to re-base the branch down to a reasonable number of useful commits :)