Fixup for Spree 2.0

Change-Id: If50e848a4d78601bd6d97b1379443b4eba22eced