I'll fix that soon.  I want to take the time and see how
much the behavior changes.

[[Imported from SVN: r6739]]