Fix #394, revert merge of PR #383.

Checklist (Please check before submitting)

[X] I reviewed the Contributing Guide.
[X] I signed and emailed the appropriate Contributor License Agreement to GSFC-SoftwareRelease@mail.nasa.gov and copied cfs-program@lists.nasa.gov.

Describe the contribution Fixes #394.

Expected behavior changes Reverts #383.

Contributor Info - All information REQUIRED for consideration of pull request Dylan Z. Baker - NASA/GSFC

nasa / CF