r26686: Fix bug 5143 by Jason Tarbet. This prevented an easy cut-and-paste of