Revert "Add mandatory fields explicitly."

That did not work well, apparently.