Pull in ordering fix from upstream