I don't want to merge it in, just want to start fixing the issue. But this is how it used to be in spree before.