Backed out changeset 85d2c5b844bc (bug 989289) because we realized it'd break add-on toolbars, a=backout