Backed out changeset 5a476e673470 (bug 1073615) for causing various intermittent failures.