first try at porting for use with spree 2.0.3