Let's try this fix for the ordering bug, instead

[#52734615]

https://www.pivotaltracker.com/story/show/52734615