diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index 74a4f332d9..45d699305d 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -301,10 +301,6 @@ module Spree
       number
     end
 
-    def shipped_shipments
-      shipments.shipped
-    end
-
     def contains?(variant)
       find_line_item_by_variant(variant).present?
     end
diff --git a/app/models/spree/return_authorization.rb b/app/models/spree/return_authorization.rb
index fae012a084..9f353cd2fd 100644
--- a/app/models/spree/return_authorization.rb
+++ b/app/models/spree/return_authorization.rb
@@ -63,7 +63,7 @@ module Spree
     end
 
     def returnable_inventory
-      order.shipped_shipments.collect{ |s| s.inventory_units.to_a }.flatten
+      order.shipments.shipped.collect{ |s| s.inventory_units.to_a }.flatten
     end
 
     # Used when Adjustment#update_adjustment! wants to update the related adjustment
@@ -74,7 +74,7 @@ module Spree
     private
 
     def must_have_shipped_units
-      return unless order.nil? || order.shipped_shipments.none?
+      return unless order.nil? || order.shipments.shipped.none?
 
       errors.add(:order, Spree.t(:has_no_shipped_units))
     end