Revert "Remove singleton thing for Field"

This reverts commit 7381fee6498a1b08bf7feed1ba539295146d9568.