Backed out changeset 54c3db0a16da (bug 843868) for bustage. a=backout