Revert "MetaData"

This reverts commit c277d6a54c5a5ae3c7e88c390527a5e55a866655.
Revert "Merge"

This reverts commit 800029423dc55a175549bd79807452178c07ee2d, reversing
changes made to c277d6a54c5a5ae3c7e88c390527a5e55a866655.