This commit break the shipping form for public and portal user. This reverts commit d3ff48533f.
d3ff48533f