2-0-stable fix order_decorator conflict

#3636 left two failings specs. This one should get a green build again.