This is a backward incompatible change so we can't do it in the 3.x line.