Revert adding DiskID