This reverts commit 730765de91.
This needs more thought, committing it on the same day as filing
the bug was premature.
This reverts commit 730765de91.
This needs more thought, committing it on the same day as filing
the bug was premature.