Revert "Merge pull request #542 from malmaud/metadata-v2"

This reverts commit f67b0aad5e60b349b9c2f549ea065644583a092e, reversing
changes made to 29b2a0502db8287f50f049f83b60f398bc19801b.