Revert changes from #1981

This is due to sbounmy suggesting it could be useful:
https://github.com/spree/spree/issues/1981#issuecomment-11682782