Backport to work with Spree 2.2