This reverts commit 4d47f7bf3c. This is one of two candidates for introducing the instabilities that John Wiegley observed. We need to reintroduce with careful testing only. The original patch has been mostly reverted.
4d47f7bf3c