I had cherry picked that commit into this branch b/c this branch needed it before I did the merge to master. I'll rebase again and see if this goes away.