--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -24,17 +24,16 @@ if test "$OS_ARCH" = "WINNT"; then
 fi
 
 MOZ_CHROME_FILE_FORMAT=omni
 MOZ_SAFE_BROWSING=1
 MOZ_SERVICES_AITC=1
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_METRICS=1
-MOZ_SERVICES_NOTIFICATIONS=1
 MOZ_SERVICES_SYNC=1
 MOZ_APP_VERSION=$FIREFOX_VERSION
 MOZ_EXTENSIONS_DEFAULT=" gio"
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
 # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results,
 # because branding dependencies are broken.
 # MOZ_BRANDING_DIRECTORY is the default branding directory used when none is
 # specified. It should never point to the "official" branding directory.

--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -468,19 +468,16 @@
 #ifdef MOZ_SERVICES_AITC
 @BINPATH@/components/AitcComponents.manifest
 @BINPATH@/components/Aitc.js
 #endif
 #ifdef MOZ_SERVICES_HEALTHREPORT
 @BINPATH@/components/HealthReportComponents.manifest
 @BINPATH@/components/HealthReportService.js
 #endif
-#ifdef MOZ_SERVICES_NOTIFICATIONS
-@BINPATH@/components/NotificationsComponents.manifest
-#endif
 #ifdef MOZ_SERVICES_SYNC
 @BINPATH@/components/SyncComponents.manifest
 @BINPATH@/components/Weave.js
 #endif
 @BINPATH@/components/TelemetryPing.js
 @BINPATH@/components/TelemetryPing.manifest
 @BINPATH@/components/messageWakeupService.js
 @BINPATH@/components/messageWakeupService.manifest

--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -895,16 +895,17 @@ xpicleanup@BIN_SUFFIX@
   components/FeedConverter.js
   components/FeedProcessor.js
   components/FeedWriter.js
   components/fuelApplication.js
   components/GPSDGeolocationProvider.js
   components/interfaces.manifest
   components/jsconsole-clhandler.js
   components/NetworkGeolocationProvider.js
+  components/NotificationsComponents.manifest
   components/nsBadCertHandler.js
   components/nsBlocklistService.js
   components/nsBrowserContentHandler.js
   components/nsBrowserGlue.js
   components/nsContentDispatchChooser.js
   components/nsContentPrefService.js
   components/nsDefaultCLH.js
   components/nsDownloadManagerUI.js
@@ -1051,16 +1052,17 @@ xpicleanup@BIN_SUFFIX@
   modules/Services.jsm
   modules/services-common/async.js
   modules/services-common/log4moz.js
   modules/services-common/observers.js
   modules/services-common/preferences.js
   modules/services-common/rest.js
   modules/services-common/stringbundle.js
   modules/services-common/utils.js
+  modules/services-notifications/service.js
   modules/services-sync/auth.js
   modules/services-sync/base_records/collection.js
   modules/services-sync/base_records/crypto.js
   modules/services-sync/base_records/keys.js
   modules/services-sync/base_records/wbo.js
   modules/services-sync/constants.js
   modules/services-sync/engines/bookmarks.js
   modules/services-sync/engines/clients.js

--- a/services/Makefile.in
+++ b/services/Makefile.in
@@ -20,17 +20,13 @@ endif
 ifdef MOZ_SERVICES_HEALTHREPORT
 PARALLEL_DIRS += healthreport
 endif
 
 ifdef MOZ_SERVICES_METRICS
 PARALLEL_DIRS += metrics
 endif
 
-ifdef MOZ_SERVICES_NOTIFICATIONS
-PARALLEL_DIRS += notifications
-endif
-
 ifdef MOZ_SERVICES_SYNC
 PARALLEL_DIRS += sync
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/services/makefiles.sh
+++ b/services/makefiles.sh
@@ -5,24 +5,22 @@
 add_makefiles "
   services/Makefile
   services/aitc/Makefile
   services/common/Makefile
   services/crypto/Makefile
   services/crypto/component/Makefile
   services/healthreport/Makefile
   services/metrics/Makefile
-  services/notifications/Makefile
   services/sync/Makefile
   services/sync/locales/Makefile
 "
 
 if [ "$ENABLE_TESTS" ]; then
   add_makefiles "
     services/aitc/tests/Makefile
     services/common/tests/Makefile
     services/crypto/tests/Makefile
     services/healthreport/tests/Makefile
     services/metrics/tests/Makefile
-    services/notifications/tests/Makefile
     services/sync/tests/Makefile
   "
 fi

deleted file mode 100644
--- a/services/notifications/Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH     := @DEPTH@
-topsrcdir := @top_srcdir@
-srcdir    := @srcdir@
-VPATH     := @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_COMPONENTS := \
-  NotificationsComponents.manifest \
-  $(NULL)
-
-PREF_JS_EXPORTS := $(srcdir)/services-notifications.js
-
-modules := \
-  service.js \
-  $(NULL)
-
-NOTIFICATION_MODULE_FILES := $(modules)
-NOTIFICATION_MODULE_DEST = $(FINAL_TARGET)/modules/services-notifications
-INSTALL_TARGETS += NOTIFICATION_MODULE
-
-TEST_DIRS += tests
-
-include $(topsrcdir)/config/rules.mk

deleted file mode 100644
--- a/services/notifications/NotificationsComponents.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-# Register resource aliases
-resource services-notifications resource://gre/modules/services-notifications/

deleted file mode 100644
--- a/services/notifications/README
+++ /dev/null
@@ -1,11 +0,0 @@
-Here lies most of the moving parts for push notifcations in the browser. DOM
-and UI bindings will live elsewhere; these files deal with talking to the API,
-storing messages, and creating persistent connections to the notification
-server.
-
-Structure:
-
-services.js::Service
-  This is a singleton that manages API calls and message storage. It's an
-  instance of the NotificationSvc class. Messages and state are persisted to a
-  JSON file on disk.

deleted file mode 100644
--- a/services/notifications/service.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-this.EXPORTED_SYMBOLS = ["Service"];
-
-const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
-
-Cu.import("resource://services-common/preferences.js");
-
-const PREFS_BRANCH = "services.notifications.";
-
-
-function NotificationSvc() {
-  this.ready = false;
-  this.prefs = new Preferences(PREFS_BRANCH);
-}
-NotificationSvc.prototype = {
-
-  get serverURL() this.prefs.get("serverURL"),
-
-  onStartup: function onStartup() {
-    this.ready = true;
-  }
-};
-
-this.Service = new NotificationSvc();
-Service.onStartup();

deleted file mode 100644
--- a/services/notifications/services-notifications.js
+++ /dev/null
@@ -1,1 +0,0 @@
-pref("services.notifications.serverURL", "https://notifications.mozilla.org/");

deleted file mode 100644
--- a/services/notifications/tests/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = test_services_notifications
-XPCSHELL_TESTS = unit
-
-include $(topsrcdir)/config/rules.mk

deleted file mode 100644
--- a/services/notifications/tests/unit/head_helpers.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
-
-let _ = function() print(Array.slice(arguments).join(" "));

deleted file mode 100644
--- a/services/notifications/tests/unit/test_service_start.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Check that everything is getting hooked together properly.
-function run_test() {
-  _("When imported, Service.onStartup is called.");
-  Cu.import("resource://services-notifications/service.js");
-
-  do_check_eq(Service.serverURL, "https://notifications.mozilla.org/");
-  do_check_eq(Service.ready, true);
-}

deleted file mode 100644
--- a/services/notifications/tests/unit/xpcshell.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-head = head_helpers.js
-tail =
-
-[test_service_start.js]

--- a/testing/xpcshell/xpcshell.ini
+++ b/testing/xpcshell/xpcshell.ini
@@ -85,17 +85,16 @@ skip-if = os == "android"
 [include:content/test/unit/xpcshell.ini]
 [include:toolkit/components/url-classifier/tests/unit/xpcshell.ini]
 [include:services/aitc/tests/unit/xpcshell.ini]
 [include:services/common/tests/unit/xpcshell.ini]
 [include:services/crypto/tests/unit/xpcshell.ini]
 [include:services/crypto/components/tests/unit/xpcshell.ini]
 [include:services/healthreport/tests/xpcshell/xpcshell.ini]
 [include:services/metrics/tests/xpcshell/xpcshell.ini]
-[include:services/notifications/tests/unit/xpcshell.ini]
 [include:services/sync/tests/unit/xpcshell.ini]
 # Bug 676978: tests hang on Android
 skip-if = os == "android"
 [include:browser/components/dirprovider/tests/unit/xpcshell.ini]
 [include:browser/components/downloads/test/unit/xpcshell.ini]
 [include:browser/components/feeds/test/unit/xpcshell.ini]
 [include:browser/components/migration/tests/unit/xpcshell.ini]
 [include:browser/components/places/tests/unit/xpcshell.ini]

--- a/xulrunner/confvars.sh
+++ b/xulrunner/confvars.sh
@@ -11,10 +11,9 @@ MOZ_CHROME_FILE_FORMAT=omni
 MOZ_APP_VERSION=$MOZILLA_VERSION
 MOZ_PLACES=1
 MOZ_EXTENSIONS_DEFAULT=" gio"
 MOZ_URL_CLASSIFIER=1
 MOZ_SERVICES_AITC=1
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_METRICS=1
-MOZ_SERVICES_NOTIFICATIONS=1
 MOZ_SERVICES_SYNC=1