They are readily derivable from other fields, so this is more efficient, and less error prone. Fixes #18494