Reverting 01be35fb901d7e23344ef5ffa10aa3729ac7e18e, as the add/remove product functions were actually needed.