[bzbarsky]

Like the bug comments there say (comment 19 in particular), once it's verified that the fix works it will be uplifted to the release branch.