This reverts commit ccd9075.
Revert to pre 0.8.4 behavior.
I did not realize how many people depended on the pre-0.8.4 behavior.
Now I think that changing it in #92 (as discussed in #91) was a
A later commit will add a new option to do what was desired in #91.