Revert "Merge branch 'spree_2-0-stable' into 2-0-stable"

This reverts commit 310f717f7c59a2b1b268f19acfd2d53f2953f293, reversing
changes made to b1b4753a98ea1507deb7663cb61d2ab5483b4704.