@daviddavis, I realize that this PR didn't introduce this behavior, so this doesn't need to be addressed as part of this PR.  That said, I'd like us to take a look at it to see if this is really what we want.