Fixed product validation to work again, and be inline with #2110345