Revert "Issue #2335909 - Disable too restrictive field requirement."

This reverts commit 042f04430bb8e853ec98f8d30fa03b300e64baa3.