Revert the change for BlockStoreShuffleFetcher