Pull in admin fix from 2 2 stable

The fix I got into spree/2-2-stable ended up being slightly different than the fix we had in our branch.

When I actually merge this in I'll rebase and remove the old commit rather than reverting it.