Back out most of 46dbbe83. The order is correct -- or, rather, the order is the same as the order that response data is provided. Change the order will break all other drivers.
