Revert patch of r218493, delete the test case