diff --git a/.pipelines/build.cmd b/.pipelines/build.cmd
index 6896fde..24c7ea3 100644
--- a/.pipelines/build.cmd
+++ b/.pipelines/build.cmd
@@ -18,13 +18,13 @@ if errorlevel 1 goto :error
 REM Setting up
 echo.
 echo Excluding the unnecessary modules and prepares to build the drop for UWP...
-call gn --ide=vs2019 gen out\msvc\x64\Release --filters=//:webrtc --args="is_debug=false use_lld=false is_clang=false rtc_include_tests=false rtc_build_tools=false rtc_win_video_capture_winrt=true target_os=\"winuwp\" rtc_build_examples=false"
+call gn gen --ide=vs2019 out\msvc\uwp\Release\x64 --filters=//:webrtc "--args=is_debug=false use_lld=false is_clang=false rtc_include_tests=false rtc_build_tools=false rtc_win_video_capture_winrt=true target_os=\"winuwp\" rtc_build_examples=false rtc_win_use_mf_h264=true enable_libaom=false rtc_enable_protobuf=false"
 if errorlevel 1 goto :error
 
 REM Building
 echo.
 echo Building the patched WebRTC...
-ninja -C out\msvc\x64\Release
+ninja -C out\msvc\uwp\Release\x64
 if errorlevel 1 goto :error
 
 REM Copying the binaries
diff --git a/.pipelines/restore-acquiring_code.cmd b/.pipelines/restore-acquiring_code.cmd
index d1f5df7..f82ebac 100644
--- a/.pipelines/restore-acquiring_code.cmd
+++ b/.pipelines/restore-acquiring_code.cmd
@@ -31,58 +31,27 @@ if errorlevel 1 goto :error
 
 REM Getting depot_tools
 echo.
-echo Cloning the depot_tools repo in the root of the c:drive...
+echo Downloading the depot_tools...
+curl https://storage.googleapis.com/chrome-infra/depot_tools.zip --output depot_tools.zip
+if errorlevel 1 goto :error
+
+echo.
+echo Opening the zip file...
 c:
-cd \
+mkdir c:\depot_tools
 if errorlevel 1 goto :error
 
-git clone https://chromium.googlesource.com/chromium/tools/depot_tools
+tar -xf depot_tools.zip -C /../depot_tools/
 if errorlevel 1 goto :error
 
 echo.
-echo Switching to the m80 branch of depot_tools...
-cd depot_tools
-if errorlevel 1 goto :error
-
-git checkout chrome/3987
-if errorlevel 1 goto :error
-
-git fetch
-if errorlevel 1 goto :error
-
-REM At this moment, gclient will offer to use the most recent version of deplot_tools. 
-REM We do not want that because the most recent version of depot_tools dropped compatibility 
-REM with python 2.7 that is currently required for building for Windows by some components.
-echo.
-echo Downloading gclient...
-echo N | gclient
-if errorlevel 1 goto :error
+echo Deleting the depot_tools.zip file
+del depot_tools.zip
 
 echo.
 echo Setting the path environment variable...
 set PATH=c:\depot_tools;%PATH%
 
-REM Installing Python 2.7
-echo.
-echo Making sure that any python program executed in this session comes from the depot_tools...
-set errPython=
-for /f "delims=" %%i in ('where python') do (
-	if c:\depot_tools\python.bat==%%i set errPython==0
-)
-if not defined errPython goto :error
-
-echo.
-echo Installing pip...
-call python -m pip install --upgrade pip
-
-echo.
-echo Figuring out where pip was installed...
-cd c:\depot_tools
-if errorlevel 1 goto :error
-
-for /f "delims=" %%i in ('where /r . pip.exe') do cd "%%i\.."
-pip install pywin32
-
 REM Setting up the environment
 echo.
 echo Informing depot_tools to use locally installed version of Visual Studio...
@@ -104,25 +73,25 @@ if errorlevel 1 goto :error
 REM Downloading the bits
 echo.
 echo Telling the gclient tool to initialize your local copy of the repos...
-echo N | gclient
+call gclient
 if errorlevel 1 goto :error
 
 echo.
-echo Requestin the tools to fetch the WebRTC code base...
-echo N | fetch --nohooks webrtc
+echo Requesting the tools to fetch the WebRTC code base...
+call fetch --nohooks webrtc
 if errorlevel 1 goto :error
 
 echo.
-echo Changing to the branch-heads/3987 branch...
+echo Changing to the branch-heads/4147 branch...
 cd src
 if errorlevel 1 goto :error
 
-call git checkout branch-heads/3987
+call git checkout branch-heads/4147
 if errorlevel 1 goto :error
 
 echo.
 echo Instructing the tools to bring the bits from all the sub repositories to your dev box...
-echo N | gclient sync
+gclient sync -D -r branch-heads/4147
 if errorlevel 1 goto :error
 
 goto :exit
diff --git a/.pipelines/restore-applying_patches.cmd b/.pipelines/restore-applying_patches.cmd
index 9cf2f17..ceac923 100644
--- a/.pipelines/restore-applying_patches.cmd
+++ b/.pipelines/restore-applying_patches.cmd
@@ -9,12 +9,12 @@ call git config --global user.email "<>"
 if errorlevel 1 goto :error
 
 echo.
-echo Setting the WEBRTCM80_ROOT enviornment variable...
-set WEBRTCM80_ROOT=c:\webrtc\src
+echo Setting the WEBRTCM84_ROOT enviornment variable...
+set WEBRTCM84_ROOT=c:\webrtc\src
 
 echo.
 echo Running the batch file that will patch all the necessary repos from the WebRTC code base...
-..\patches_for_WebRTC_org\m80\patchWebRTCM80.cmd
+..\patches_for_WebRTC_org\m84\patchWebRTCM84.cmd
 if errorlevel 1 goto :error
 
 goto :exit