This reverts commit b772b3b219. This breaks the ABI, so backing this out until the 7.0.0 release.
b772b3b219