remove temporary workaround

spree now has a published version number (2.2.2) that solves the problem.
Merge branch 'remove-workaround' into 2-2-stable