Partially-functional bug fix. I think MS Hates Chrome, possibly