(replying from the archive)> This reverts commit febfd9d3c7f74063e8e630b15413ca91b567f963.CCing Tariq on this one, unless there is some deep magic this one looksokay, too.