Revert "Merge pull request #30 from godaddy/3395"

This reverts commit 2f19c9ac32beaec7584999339b30bbffe8a22e36, reversing
changes made to 74788c37b1c692fba5ff4e9ae32a66b7a571324d.
Merge branch '2-2-nemo-stable' of github.com:godaddy/spree into rails_upgrade