Revert "Merge branch '2digit_product_code_url_fix' into beta"

This reverts commit dfee7b1c186f3edf550fbbbf6fb60be3237484b5, reversing
changes made to 5a8d86f14d1cea7261e58143fc899c445b457f0e.