Move metadata back to ObjectMetadata from ACB so that it can be discovered