Backport INFO fix to 2.x

I just hit this on a project whose dependencies prevent using 3.x, and while I'm looking to resolve that, since a fix was applied to 3.x, I thought I'd backport it.