r11374: On request from VL, put the plaintext auth patch in.