Revert "Make test pass on R16B03+"

This reverts commit c6bcda61252d5e7578995024acf3fa2ba0ef9c2c.