I didn't realize there were other code paths that were affected since this is the only code path that we modified in this patch. But your argument seems reasonable.