Revert "Fix compliance with classic model"
Revert "Fix compliance with classic model"

This reverts commit 513e10d0576866d966ce2d3748b166004c506862.

Unidata/netcdf-c,Unidata/netcdf-c,Unidata/netcdf-c,Unidata/netcdf-c