Relanding bug 991392 as a backout of changeset a192ea8b6fce because it has no tests and can't cause browser-chrome bustage, r=me
Relanding bug 991175 as a backout of changeset b1b18a46eda2 because it has no tests and can't cause browser-chrome bustage, r=me