diff --git a/update_check_scheduler.cc b/update_check_scheduler.cc
index ff597c6..85e734f 100644
--- a/update_check_scheduler.cc
+++ b/update_check_scheduler.cc
@@ -20,7 +20,6 @@
 const int UpdateCheckScheduler::kTimeoutRegularFuzz        = 10 * 60;
 
 UpdateCheckScheduler::UpdateCheckScheduler(UpdateAttempter* update_attempter,
-                                           GpioHandler* gpio_handler,
                                            SystemState* system_state)
     : update_attempter_(update_attempter),
       enabled_(false),
@@ -28,7 +27,6 @@
       last_interval_(0),
       poll_interval_(0),
       is_test_update_attempted_(false),
-      gpio_handler_(gpio_handler),
       system_state_(system_state) {}
 
 UpdateCheckScheduler::~UpdateCheckScheduler() {}
@@ -91,10 +89,10 @@
   me->scheduled_ = false;
 
   bool is_test_mode = false;
+  GpioHandler* gpio_handler = me->system_state_->gpio_handler();
   if (me->system_state_->IsOOBEComplete() ||
       (is_test_mode = (!me->is_test_update_attempted_ &&
-                       me->gpio_handler_ &&
-                       me->gpio_handler_->IsTestModeSignaled()))) {
+                       gpio_handler->IsTestModeSignaled()))) {
     if (is_test_mode) {
       LOG(WARNING)
           << "test mode signaled, allowing update check prior to OOBE complete";