Revert -r82559; it's not clear that this is the right thing to do, and the change obscures the original intentions.