Revert "meta fields change 16"

This reverts commit 4d65f14c25e7fdd49fb0a66678c2b3595b5441ca.