This reverts commit 8090ae66. This patch breaks IBM MPI and is not required for newer netCDF versions
