This still need to be tackled. If we cannot get rid of the legacy cruft and need to spread it here, then let's at least make it explicit by no accepting any values that have non-0 values for those fields.