This reverts commit f971c4c0b5.
After further discussion, this is a good first step toward a fix, so I
am putting it back.
This reverts commit f971c4c0b5.
After further discussion, this is a good first step toward a fix, so I
am putting it back.