Don't integrate this. I think I found another issue.

Yes, I'll also mark this file as binary.