Backed out changeset 7dd13d06f132 (bug 862849) for breaking webconsole tests