A bad case of the Centipede's Dilemma

To "encourage tabbed browsing", Firefox 4 switches around the familiar positions of "new tab" and "new window" in the right-click menu... thus screwing up everyone who already was, forcing them me to consciously select the right option every time. Thanks, guys.

EDIT: Ended up uninstalling and going back to 3.6.16 until they either undo this and other "helpful" "improvements" or provide a convenient method for the user to do so - finding and editing userChrome.css by hand does not count, and the Menu Editor add-on doesn't get everything.