Backed out 2 changesets (bug 934503) for browser-chrome bustage

Backed out changeset f631148645b3 (bug 934503)
Backed out changeset a8131d677d9b (bug 934503)