Comment 2 for bug 1329772

Upstream?