I have no recollection why I made this change -- it's a bit odd, as I prefer the old to the new.  In any event, reverting the change doesn't seem to break any tests, so I'll put it back.