Backed out changeset 49aabddb2edb (bug 852687) for browser-chrome failures