r25345 patched the wrong line.