Do for GR16_NOREX what r69049 did for GR8_NOREX, to avoid trouble with