Backed out changeset b83296ec51b3 (bug 832112) for comm-central bustage, r=glandium.