Revert r123908; the code in question is completely untested and wrong.