Manually copy patch for bug 7250 from the release26-maint branch. I suck

because I did this in the wrong order and couldn't smack svnmerge into
submission.