4 files changed, 26 insertions, 27 deletions
diff --git a/lib/repl.js b/lib/repl.js
index 7140e1b56c..a7eb22e396 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -87,10 +87,13 @@ const {
   propertyFilter: {
     ALL_PROPERTIES,
     SKIP_SYMBOLS
-  },
+  }
+} = internalBinding('util');
+const {
   startSigintWatchdog,
   stopSigintWatchdog
-} = internalBinding('util');
+} = internalBinding('contextify');
+
 const history = require('internal/repl/history');
 
 // Lazy-loaded.
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
index 25b8b28ecd..f8d43e062e 100644
--- a/src/node_contextify.cc
+++ b/src/node_contextify.cc
@@ -1141,6 +1141,20 @@ void ContextifyContext::CompileFunction(
   args.GetReturnValue().Set(fn);
 }
 
+static void StartSigintWatchdog(const FunctionCallbackInfo<Value>& args) {
+  int ret = SigintWatchdogHelper::GetInstance()->Start();
+  args.GetReturnValue().Set(ret == 0);
+}
+
+static void StopSigintWatchdog(const FunctionCallbackInfo<Value>& args) {
+  bool had_pending_signals = SigintWatchdogHelper::GetInstance()->Stop();
+  args.GetReturnValue().Set(had_pending_signals);
+}
+
+static void WatchdogHasPendingSigint(const FunctionCallbackInfo<Value>& args) {
+  bool ret = SigintWatchdogHelper::GetInstance()->HasPendingSignal();
+  args.GetReturnValue().Set(ret);
+}
 
 void Initialize(Local<Object> target,
                 Local<Value> unused,
@@ -1149,6 +1163,12 @@ void Initialize(Local<Object> target,
   Environment* env = Environment::GetCurrent(context);
   ContextifyContext::Init(env, target);
   ContextifyScript::Init(env, target);
+
+  env->SetMethod(target, "startSigintWatchdog", StartSigintWatchdog);
+  env->SetMethod(target, "stopSigintWatchdog", StopSigintWatchdog);
+  // Used in tests.
+  env->SetMethodNoSideEffect(
+      target, "watchdogHasPendingSigint", WatchdogHasPendingSigint);
 }
 
 }  // namespace contextify
diff --git a/src/node_util.cc b/src/node_util.cc
index d13624a436..961df0b73c 100644
--- a/src/node_util.cc
+++ b/src/node_util.cc
@@ -1,5 +1,4 @@
 #include "node_errors.h"
-#include "node_watchdog.h"
 #include "util.h"
 #include "base_object-inl.h"
 
@@ -157,24 +156,6 @@ static void SetHiddenValue(const FunctionCallbackInfo<Value>& args) {
   args.GetReturnValue().Set(maybe_value.FromJust());
 }
 
-
-void StartSigintWatchdog(const FunctionCallbackInfo<Value>& args) {
-  int ret = SigintWatchdogHelper::GetInstance()->Start();
-  args.GetReturnValue().Set(ret == 0);
-}
-
-
-void StopSigintWatchdog(const FunctionCallbackInfo<Value>& args) {
-  bool had_pending_signals = SigintWatchdogHelper::GetInstance()->Stop();
-  args.GetReturnValue().Set(had_pending_signals);
-}
-
-
-void WatchdogHasPendingSigint(const FunctionCallbackInfo<Value>& args) {
-  bool ret = SigintWatchdogHelper::GetInstance()->HasPendingSignal();
-  args.GetReturnValue().Set(ret);
-}
-
 void ArrayBufferViewHasBuffer(const FunctionCallbackInfo<Value>& args) {
   CHECK(args[0]->IsArrayBufferView());
   args.GetReturnValue().Set(args[0].As<ArrayBufferView>()->HasBuffer());
@@ -281,11 +262,6 @@ void Initialize(Local<Object> target,
   env->SetMethodNoSideEffect(target, "getOwnNonIndexProperties",
                                      GetOwnNonIndexProperties);
 
-  env->SetMethod(target, "startSigintWatchdog", StartSigintWatchdog);
-  env->SetMethod(target, "stopSigintWatchdog", StopSigintWatchdog);
-  env->SetMethodNoSideEffect(target, "watchdogHasPendingSigint",
-                             WatchdogHasPendingSigint);
-
   env->SetMethod(target, "arrayBufferViewHasBuffer", ArrayBufferViewHasBuffer);
   Local<Object> constants = Object::New(env->isolate());
   NODE_DEFINE_CONSTANT(constants, ALL_PROPERTIES);
diff --git a/test/parallel/test-util-sigint-watchdog.js b/test/parallel/test-util-sigint-watchdog.js
index 7ac1261eab..67a8f61539 100644
--- a/test/parallel/test-util-sigint-watchdog.js
+++ b/test/parallel/test-util-sigint-watchdog.js
@@ -8,7 +8,7 @@ if (common.isWindows) {
 
 const assert = require('assert');
 const { internalBinding } = require('internal/test/binding');
-const binding = internalBinding('util');
+const binding = internalBinding('contextify');
 
 [(next) => {
   // Test with no signal observed.