Reverted to 18c96acc

To get rid of R/I swap bug in high band