Stay compatible with pre-R16 OTP.