Fuzev2: revert r25741 and r25746