Note that this change does *not* enable the new data model by default, but does allow it to be used when a special environment variable is specified.