Don't use the bundle name as a tag
For some reason, it's broken, and it's not worth trying to fix it, since people didn't like it anyway.
BUG:394345 (cherry picked from commit 71a1ba028b7904d8064a5d746b5d28ce2d9441dd)