Should drop this in the v3.0 version and bring it back in the v3.1 version.