Revert r141870. The test case crashes on linux with data corruption. A deeper issue...