Reimplement https://github.com/spree/spree/pull/1548 for the same reason