Backed out changeset 6efbbdf09c63 (bug 1001845) for refest failures