Backed out changeset ebcbf7155214 (bug 784042) for metro-chrome bustage