Backed out changeset aa9a0b34bbd8 (bug 878435) for checktest failures.