Reintroduced bug in r/i swapping in high band data.

(For consistency with earlier testing)