Revert r88043. It was broken in several ways.