Attempt at upgrading commerce_coffee to 2.x