From 629d98cad74230049e9325a41f0b9dc2d9d17ebf Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Tue, 15 Aug 2017 19:27:16 -0400
Subject: [PATCH] Backed out changeset 8df491f3dcdf for landing with the wrong
 bug number in the commit message.

---
 dom/payments/test/mochitest.ini | 1 -
 toolkit/components/moz.build    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dom/payments/test/mochitest.ini b/dom/payments/test/mochitest.ini
index a2dfd098f7eb..6ce26387a01a 100644
--- a/dom/payments/test/mochitest.ini
+++ b/dom/payments/test/mochitest.ini
@@ -10,7 +10,6 @@ support-files =
   ShowPaymentChromeScript.js
 
 [test_abortPayment.html]
-run-if = nightly_build # Bug 1390018: Depends on the Nightly-only UI service
 [test_basiccard.html]
 [test_canMakePayment.html]
 [test_constructor.html]
diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index 8466ec2e40d7..dc3a0cd2570a 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -115,5 +115,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
         'nsDefaultCLH.manifest',
     ]
 
-if CONFIG['NIGHTLY_BUILD'] and CONFIG['MOZ_BUILD_APP'] == 'browser':
+if CONFIG['MOZ_BUILD_APP'] == 'browser':
     DIRS += ['payments']