Revert r207271 for now. This commit introduced a test case that ran