remove the code added in r90497. It has several major issues and no tests.