KCINFR-1008: Reverting fix. Need to investigate why there are fewer errors on saving empty reqd fields.