Since I could not find a workaround for this and blocking a deployment, I'm subscribing to field-high.
Since I could not find a workaround for this and blocking a deployment, I'm subscribing to field-high.