Are you going to rewrite this part? If not, can you revert your change here so we can merge? Thanks.