Bug 861495 resolved fixed, adopt Firebug code