Backout Bug 607392 - split tagging into en-US and other. r=backout