hdf5

[svn-r21796] Description:
    Back out r21782 while I figure out what the problem is with the change.

Tested on:
    Daily tests... :-/