Add the rbmipsnand fix from #1778