Revert commit. Further developments on save-hdf.

This reverts commit da299c74ddc8553cb0d43e288f02a1be345680ab.