Revert "Support for spree 2.1"
Merge branch 'revert-1-master'