The extraction script currently applies a small patch to the top level SConstruct when it extracts them. The patch removes the 'client_build' directory from the variant directory in which SConscript.client is evaluated. We should not do that so that the files we fork are pristine copies of the upstream sources, and then the patch should be applied manually after we have forked.