Revert: re-establish optional product  join table behavior (ccf1f1fc2d3e3b9ea173fab6e74093646f8f216e)