Revert "meta fields change"

This reverts commit 8207f873d5f6a60a28254787e106f04448b9f000.