47e83d86d1
Note: This should be multiple files, but since it is also broken in stable, I thought I'd do a fix that could be MFC'd. This is a MFC candidate.