Backed out changeset cabda6c7f0e9 (bug 947914) for frequent test failures.