Backed out changeset 5ea64b6ba89b (bug 889201) for too-frequent failures