diff --git a/update_attempter.cc b/update_attempter.cc
index 433d112..7824cd8 100644
--- a/update_attempter.cc
+++ b/update_attempter.cc
@@ -590,11 +590,8 @@
   shared_ptr<OmahaResponseHandlerAction> response_handler_action(
       new OmahaResponseHandlerAction(system_state_));
   shared_ptr<FilesystemVerifierAction> src_filesystem_verifier_action(
-      new FilesystemVerifierAction(system_state_,
-                                   PartitionType::kSourceRootfs));
-  shared_ptr<FilesystemVerifierAction> src_kernel_filesystem_verifier_action(
-      new FilesystemVerifierAction(system_state_,
-                                   PartitionType::kSourceKernel));
+      new FilesystemVerifierAction(system_state_->boot_control(),
+                                   VerifierMode::kComputeSourceHash));
 
   shared_ptr<OmahaRequestAction> download_started_action(
       new OmahaRequestAction(system_state_,
@@ -619,9 +616,8 @@
                                                     system_state_),
                              false));
   shared_ptr<FilesystemVerifierAction> dst_filesystem_verifier_action(
-      new FilesystemVerifierAction(system_state_, PartitionType::kRootfs));
-  shared_ptr<FilesystemVerifierAction> dst_kernel_filesystem_verifier_action(
-      new FilesystemVerifierAction(system_state_, PartitionType::kKernel));
+      new FilesystemVerifierAction(system_state_->boot_control(),
+                                   VerifierMode::kVerifyTargetHash));
   shared_ptr<OmahaRequestAction> update_complete_action(
       new OmahaRequestAction(system_state_,
                              new OmahaEvent(OmahaEvent::kTypeUpdateComplete),
@@ -637,15 +633,11 @@
   actions_.push_back(shared_ptr<AbstractAction>(response_handler_action));
   actions_.push_back(shared_ptr<AbstractAction>(
       src_filesystem_verifier_action));
-  actions_.push_back(shared_ptr<AbstractAction>(
-      src_kernel_filesystem_verifier_action));
   actions_.push_back(shared_ptr<AbstractAction>(download_started_action));
   actions_.push_back(shared_ptr<AbstractAction>(download_action));
   actions_.push_back(shared_ptr<AbstractAction>(download_finished_action));
   actions_.push_back(shared_ptr<AbstractAction>(
       dst_filesystem_verifier_action));
-  actions_.push_back(shared_ptr<AbstractAction>(
-      dst_kernel_filesystem_verifier_action));
 
   // Bond them together. We have to use the leaf-types when calling
   // BondActions().
@@ -654,15 +646,10 @@
   BondActions(response_handler_action.get(),
               src_filesystem_verifier_action.get());
   BondActions(src_filesystem_verifier_action.get(),
-              src_kernel_filesystem_verifier_action.get());
-  BondActions(src_kernel_filesystem_verifier_action.get(),
               download_action.get());
   BondActions(download_action.get(),
               dst_filesystem_verifier_action.get());
-  BondActions(dst_filesystem_verifier_action.get(),
-              dst_kernel_filesystem_verifier_action.get());
-
-  BuildPostInstallActions(dst_kernel_filesystem_verifier_action.get());
+  BuildPostInstallActions(dst_filesystem_verifier_action.get());
 
   actions_.push_back(shared_ptr<AbstractAction>(update_complete_action));