rollback more changes to contentMetadata generation that cauased problems