Backed out changeset c516d7e67150 (bug 817945) for causing bug 856997. a=backout