Apparently it's currently no longer needed, but making sure and dealing with the legalities is a sufficient drag that it's easier to live with the renaming: https://bugzilla.mozilla.org/show_bug.cgi?id=555935