Revert "Be more explicit about what is required for these fields."

Argh!  I derped this due to the DS code refactor. Un-derp for 9.2.1-BRANCH.

This reverts commit cdfd09e899b378d8d647e6f792624ece737f7cc6.