diff --git a/src/lib/Hydra/Controller/Root.pm b/src/lib/Hydra/Controller/Root.pm
index f921ff9e..ff329c39 100644
--- a/src/lib/Hydra/Controller/Root.pm
+++ b/src/lib/Hydra/Controller/Root.pm
@@ -111,14 +111,6 @@ sub machines :Local Args(0) {
     # Add entry for localhost.
     ${$machines}{''} //= {};
 
-    # Get the last finished build step for each machine.
-    foreach my $m (keys %{$machines}) {
-        my $idle = $c->model('DB::BuildSteps')->find(
-            { machine => "$m", stoptime => { '!=', undef } },
-            { order_by => 'stoptime desc', rows => 1 });
-        ${$machines}{$m}{'idle'} = $idle ? $idle->stoptime : 0;
-    }
-
     $c->stash->{machines} = $machines;
     $c->stash->{steps} = [ $c->model('DB::BuildSteps')->search(
         { finished => 0, 'me.busy' => 1, 'build.busy' => 1, },
diff --git a/src/root/machine-status.tt b/src/root/machine-status.tt
index 5847c970..64290d36 100644
--- a/src/root/machine-status.tt
+++ b/src/root/machine-status.tt
@@ -41,11 +41,7 @@
         [% END %]
       [% END %]
       [% IF idle == 1 %]
-        [% IF m.value.idle %] 
-          <tr><td colspan="6">Idle for [% INCLUDE renderDuration duration = curTime - m.value.idle %]</td></tr>
-        [% ELSE %]
-          <tr><td colspan="6">Never used</td></tr>
-        [% END %]
+        <tr><td colspan="6">Idle</td></tr>
       [% END %]
     </tbody>
   [% END %]