Washington's experiment patch. See
https://github.com/spree/spree/pull/3497