Swap the order of how the XHR requests are set up.

@callahad or @seanmonstar - could you guys review this?