Revert "Merge pull request #16059 from jenncoop/json-serialized-attr"

This reverts commit a03097759bd7103bb9db253e7ba095f011453f75.

This needs more work before it would work correctly on master.