Revert r225500, it leads to infinite loops.