Backed out changeset e485a12e27ae (bug 842561) for bustage. a=backout