Back out 7027f0e1334c (bug 765285) for browser-chrome bustage