This reverts commit 54547bd8.

This appears to have been a thinko on my part. I will try to come up
wioth a better solution.