The sanitizer bots turned green again after another change went in, i.e. revert 26dd64ba, so I don't think this patch was causing the problems.
