This only seems to affect 3.0 and above.  We should have a check for this so we don't trigger an unnecessary in versions below 3.0.