Undoing the last commit after understaning HDF5's API Compatibility Macros better.