diff --git a/assets/scripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee
index d0f4a672..48b2081f 100644
--- a/assets/scripts/app/controllers.coffee
+++ b/assets/scripts/app/controllers.coffee
@@ -9,6 +9,10 @@ Travis.BuildsItemController = Em.ObjectController.extend(Travis.GithubUrlPropert
   needs: ['builds']
   isPullRequestsListBinding: 'controllers.builds.isPullRequestsList'
   buildBinding: 'content'
+
+  color: (->
+    Travis.Helpers.colorForState(@get('build.state'))
+  ).property('build.state')
 )
 
 Travis.QueueController = Em.ArrayController.extend
diff --git a/assets/scripts/app/templates/builds/list.hbs b/assets/scripts/app/templates/builds/list.hbs
index 221b16eb..262ce55b 100644
--- a/assets/scripts/app/templates/builds/list.hbs
+++ b/assets/scripts/app/templates/builds/list.hbs
@@ -22,40 +22,40 @@
 
     <tbody>
       {{#each build in controller itemController="buildsItem"}}
-        {{#view Travis.BuildsItemView contextBinding="build"}}
+        <tr {{bind-attr class="build.color"}}>
           <td class="number">
             <span class="status"></span>
-            {{#if id}}
-              {{#link-to "build" repo this}}
-                {{number}}
+            {{#if build.id}}
+              {{#link-to "build" build.repo build}}
+                {{build.number}}
               {{/link-to}}
             {{/if}}
           </td>
           <td class="message">
-            {{{formatMessage commit.message short="true" repoBinding=build.repo}}}
+            {{{formatMessage build.commit.message short="true" repoBinding=build.repo}}}
           </td>
           <td class="commit">
-            <a {{bind-attr href="urlGithubCommit"}}>
-              {{formatCommit commit}}
+            <a {{bind-attr href="build.urlGithubCommit"}}>
+              {{formatCommit build.commit}}
             </a>
           </td>
           <td class="committer">
-            {{commit.committerName}}
+            {{build.commit.committerName}}
           </td>
           {{#if isPullRequestsList}}
             <td>
-              <a {{bind-attr href="urlGithubPullRequest"}}>
-                #{{pullRequestNumber}}
+              <a {{bind-attr href="build.urlGithubPullRequest"}}>
+                #{{build.pullRequestNumber}}
               </a>
             </td>
           {{/if}}
-          <td class="duration" {{bind-attr title="duration"}}>
-            {{formatDuration duration}}
+          <td class="duration" {{bind-attr title="build.duration"}}>
+            {{formatDuration build.duration}}
           </td>
-          <td class="finished_at timeago" {{bind-attr title="formattedFinishedAt"}}>
-            {{formatTime finishedAt}}
+          <td class="finished_at timeago" {{bind-attr title="build.formattedFinishedAt"}}>
+            {{formatTime build.finishedAt}}
           </td>
-        {{/view}}
+        </tr>
       {{/each}}
     </tbody>
   </table>
diff --git a/assets/scripts/app/views/build.coffee b/assets/scripts/app/views/build.coffee
index 58a464c9..b7b2940a 100644
--- a/assets/scripts/app/views/build.coffee
+++ b/assets/scripts/app/views/build.coffee
@@ -20,19 +20,6 @@ Travis.reopen
       click: ->
         @get('controller').showMore()
 
-  BuildsItemView: Travis.View.extend
-    tagName: 'tr'
-    classNameBindings: ['color']
-    repoBinding: 'controller.repo'
-    buildBinding: 'context'
-    commitBinding: 'build.commit'
-
-    isPullRequestsList: ( -> @get('parentView.isPullRequestsList') ).property('parentView.isPullRequestsList')
-
-    color: (->
-      Travis.Helpers.colorForState(@get('build.state'))
-    ).property('build.state')
-
   BuildView: Travis.View.extend
     templateName: 'builds/show'
     classNameBindings: ['color', 'loading']