Revert r25768, r25771