This reverts commit 59a72f03, reversing changes made to fa605888.
Taking this out since the update to HDF5 is broken and it blocks updating the common-superbuild otherwise.