This is only an interim fix; MIPS should be using the MI code instead, which does not have this issue.