diff --git a/BUILD.gn b/BUILD.gn
index 1a5e526dbd23f..d8624345288e2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -32,12 +32,6 @@ declare_args() {
   enable_desktop_capturer = true
   enable_run_as_node = true
   enable_osr = false
-
-  # Provide a fake location provider for mocking
-  # the geolocation responses. Disable it if you
-  # need to test with chromium's location provider.
-  # Should not be enabled for release build.
-  enable_fake_location_provider = !is_official_build
 }
 
 if (is_mas_build) {
@@ -288,13 +282,6 @@ static_library("electron_lib") {
     ]
   }
 
-  if (enable_fake_location_provider) {
-    defines += [
-      "OVERRIDE_LOCATION_PROVIDER"
-    ]
-    sources += filenames_gypi.lib_sources_location_provider
-  }
-
   if (is_mac) {
     deps += [
       "//third_party/crashpad/crashpad/client",
@@ -390,6 +377,7 @@ static_library("electron_lib") {
   }
 
   if (enable_desktop_capturer) {
+    deps += [ "//third_party/webrtc/modules/desktop_capture" ]
     sources += [
       "atom/browser/api/atom_api_desktop_capturer.cc",
       "atom/browser/api/atom_api_desktop_capturer.h",
@@ -494,7 +482,7 @@ if (is_mac) {
       deps += [ ":electron_crashpad_helper" ]
     }
     info_plist = "atom/common/resources/mac/Info.plist"
-    extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework" ]
+    extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework", "ELECTRON_VERSION=$electron_version" ]
 
     include_dirs = [ "." ]
     sources = filenames_gypi.framework_sources
diff --git a/atom/common/resources/mac/Info.plist b/atom/common/resources/mac/Info.plist
index 7b56a46470ea0..ffbb30d463262 100644
--- a/atom/common/resources/mac/Info.plist
+++ b/atom/common/resources/mac/Info.plist
@@ -12,5 +12,7 @@
 	<string>FMWK</string>
 	<key>NSSupportsAutomaticGraphicsSwitching</key>
 	<true/>
+	<key>Version</key>
+	<string>${ELECTRON_VERSION}</string>
 </dict>
 </plist>