Yes, it's a hack and it won't work with concurrent requests.
I say leave in the client side sorting and we'll figure out
how to add more headers later.