Backed out changeset c482e61af458 (bug 888778) for busted test