Revert r24958. It didn't fix anything (in fact, the problem described didn't exist...