diff --git a/src/DrupalCI/Plugin/BuildTask/BuildTaskTrait.php b/src/DrupalCI/Plugin/BuildTask/BuildTaskTrait.php
deleted file mode 100644
index 8c3af2c..0000000
--- a/src/DrupalCI/Plugin/BuildTask/BuildTaskTrait.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace DrupalCI\Plugin\BuildTask;
-
-/**
- * @TODO: this should probably be rethought of as a Timer Trait that can be
- * used to time things, and not have the run/complete functions built in.
- */
-trait BuildTaskTrait {
-
-  /**
-   * @var float
-   */
-  protected $startTime;
-
-  /**
-   * @var float
-   *   Total time taken for this build task, including child tasks
-   */
-  protected $elapsedTime;
-
-  /**
-   * Decorator for run functions to allow all of them to be timed.
-   *
-   */
-  public function start() {
-    $this->startTime = microtime(TRUE);
-    $this->io->writeLn("<info>----------------   Starting <options=bold>" . $this->pluginId . "</>   ----------------</info>");
-
-    $this->setup();
-    $statuscode = $this->run();
-    if (!isset($statuscode)) {
-      return 0;
-    }
-    else {
-      return $statuscode;
-    }
-  }
-
-  /**
-   * Decorator for complete functions to stop their timer.
-   *
-   * @param $childStatus
-   */
-  public function finish($childStatus) {
-    $this->complete($childStatus);
-    $this->teardown();
-    $elapsed_time = microtime(TRUE) - $this->startTime;
-    $this->elapsedTime = $elapsed_time;
-    $datetime = new \DateTime();
-    $this->io->writeLn("<info>---------------- Finished <options=bold>" . $this->pluginId . "</> in " . $elapsed_time . " ---------------- </info>");
-
-  }
-
-  /**
-   * @inheritDoc
-   */
-  public function getElapsedTime($inclusive = TRUE) {
-    return $this->elapsedTime;
-  }
-
-}
diff --git a/src/DrupalCI/Plugin/BuildTaskBase.php b/src/DrupalCI/Plugin/BuildTaskBase.php
index f64c22b..c8ef464 100644
--- a/src/DrupalCI/Plugin/BuildTaskBase.php
+++ b/src/DrupalCI/Plugin/BuildTaskBase.php
@@ -13,7 +13,7 @@ use Pimple\Container;
  */
 abstract class BuildTaskBase implements Injectable, BuildTaskInterface {
 
-  use BuildTaskTrait;
+  //use BuildTaskTrait;
   /**
    * The plugin_id.
    *
@@ -95,6 +95,17 @@ abstract class BuildTaskBase implements Injectable, BuildTaskInterface {
   protected $hostCommandOutput;
 
   /**
+   * @var float
+   */
+  protected $startTime;
+
+  /**
+   * @var float
+   *   Total time taken for this build task, including child tasks
+   */
+  protected $elapsedTime;
+
+  /**
    * Constructs a Drupal\Component\Plugin\BuildTaskBase object.
    *
    * @param array $configuration_overrides
@@ -259,4 +270,43 @@ abstract class BuildTaskBase implements Injectable, BuildTaskInterface {
     throw new BuildTaskException($errorLabel, $errorDetails);
   }
 
+  /**
+   * Decorator for run functions to allow all of them to be timed.
+   *
+   */
+  public function start() {
+    $this->startTime = microtime(TRUE);
+    $this->io->writeLn("<info>----------------   Starting <options=bold>" . $this->pluginId . "</>   ----------------</info>");
+
+    $this->setup();
+    $statuscode = $this->run();
+    if (!isset($statuscode)) {
+      return 0;
+    }
+    else {
+      return $statuscode;
+    }
+  }
+
+  /**
+   * Decorator for complete functions to stop their timer.
+   *
+   * @param $childStatus
+   */
+  public function finish($childStatus) {
+    $this->complete($childStatus);
+    $this->teardown();
+    $elapsed_time = microtime(TRUE) - $this->startTime;
+    $this->elapsedTime = $elapsed_time;
+    $datetime = new \DateTime();
+    $this->io->writeLn("<info>---------------- Finished <options=bold>" . $this->pluginId . "</> in " . $elapsed_time . " ---------------- </info>");
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public function getElapsedTime($inclusive = TRUE) {
+    return $this->elapsedTime;
+  }
+
 }