diff --git a/netbox/templates/dcim/inc/frontport.html b/netbox/templates/dcim/inc/frontport.html
index 9297585ee..2b79cf7a7 100644
--- a/netbox/templates/dcim/inc/frontport.html
+++ b/netbox/templates/dcim/inc/frontport.html
@@ -1,46 +1,44 @@
-{% with cable=frontport.get_connected_cable %}
-    <tr class="frontport{% if cable %} {% if cable.status %}success{% else %}info{% endif %}{% endif %}">
+<tr class="frontport{% if cable %} {% if cable.status %}success{% else %}info{% endif %}{% endif %}">
 
-        {# Checkbox #}
-        {% if perms.dcim.change_frontport or perms.dcim.delete_frontport %}
-            <td class="pk">
-                <input name="pk" type="checkbox" value="{{ frontport.pk }}" />
-            </td>
+    {# Checkbox #}
+    {% if perms.dcim.change_frontport or perms.dcim.delete_frontport %}
+        <td class="pk">
+            <input name="pk" type="checkbox" value="{{ frontport.pk }}" />
+        </td>
+    {% endif %}
+
+    {# Name #}
+    <td>
+        <i class="fa fa-fw fa-square{% if not cable %}-o{% endif %}"></i> {{ frontport }}
+    </td>
+
+    {# Type #}
+    <td>{{ frontport.get_type_display }}</td>
+
+    {# Rear port #}
+    <td>{{ frontport.rear_port }}</td>
+    <td>{{ frontport.rear_port_position }}</td>
+
+    {# Cable #}
+    <td>
+        {% if frontport.cable %}
+            <a href="{{ frontport.cable.get_absolute_url }}">{{ frontport.cable }}</a>
+        {% else %}
+            <span class="text-muted">Not connected</span>
         {% endif %}
+    </td>
 
-        {# Name #}
-        <td>
-            <i class="fa fa-fw fa-square{% if not cable %}-o{% endif %}"></i> {{ frontport }}
-        </td>
-
-        {# Type #}
-        <td>{{ frontport.get_type_display }}</td>
-
-        {# Rear port #}
-        <td>{{ frontport.rear_port }}</td>
-        <td>{{ frontport.rear_port_position }}</td>
-
-        {# Cable #}
-        <td>
-            {% if cable %}
-                <a href="{{ cable.get_absolute_url }}">{{ cable }}</a> to <a href="{{ cable.far_end.device.get_absolute_url }}">{{ cable.far_end.device }}</a> {{ cable.far_end }}
-            {% else %}
-                <span class="text-muted">Not connected</span>
-            {% endif %}
-        </td>
-
-        {# Actions #}
-        <td class="text-right">
-            {% if perms.dcim.change_frontport %}
-                <a href="{% url 'dcim:frontport_edit' pk=frontport.pk %}?return_url={{ device.get_absolute_url }}" title="Edit port" class="btn btn-info btn-xs">
-                    <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
-                </a>
-            {% endif %}
-            {% if perms.dcim.delete_frontport %}
-                <a href="{% url 'dcim:frontport_delete' pk=frontport.pk %}?return_url={{ device.get_absolute_url }}" title="Delete port" class="btn btn-danger btn-xs">
-                    <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
-                </a>
-            {% endif %}
-        </td>
-    </tr>
-{% endwith %}
+    {# Actions #}
+    <td class="text-right">
+        {% if perms.dcim.change_frontport %}
+            <a href="{% url 'dcim:frontport_edit' pk=frontport.pk %}?return_url={{ device.get_absolute_url }}" title="Edit port" class="btn btn-info btn-xs">
+                <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
+            </a>
+        {% endif %}
+        {% if perms.dcim.delete_frontport %}
+            <a href="{% url 'dcim:frontport_delete' pk=frontport.pk %}?return_url={{ device.get_absolute_url }}" title="Delete port" class="btn btn-danger btn-xs">
+                <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
+            </a>
+        {% endif %}
+    </td>
+</tr>
diff --git a/netbox/templates/dcim/inc/rearport.html b/netbox/templates/dcim/inc/rearport.html
index 9a8128de4..424565b19 100644
--- a/netbox/templates/dcim/inc/rearport.html
+++ b/netbox/templates/dcim/inc/rearport.html
@@ -1,45 +1,43 @@
-{% with cable=rearport.get_connected_cable %}
-    <tr class="rearport{% if cable %} {% if cable.status %}success{% else %}info{% endif %}{% endif %}">
+<tr class="rearport{% if cable %} {% if cable.status %}success{% else %}info{% endif %}{% endif %}">
 
-        {# Checkbox #}
-        {% if perms.dcim.change_rearport or perms.dcim.delete_rearport %}
-            <td class="pk">
-                <input name="pk" type="checkbox" value="{{ rearport.pk }}" />
-            </td>
+    {# Checkbox #}
+    {% if perms.dcim.change_rearport or perms.dcim.delete_rearport %}
+        <td class="pk">
+            <input name="pk" type="checkbox" value="{{ rearport.pk }}" />
+        </td>
+    {% endif %}
+
+    {# Name #}
+    <td>
+        <i class="fa fa-fw fa-square{% if not cable %}-o{% endif %}"></i> {{ rearport }}
+    </td>
+
+    {# Type #}
+    <td>{{ rearport.get_type_display }}</td>
+
+    {# Positions #}
+    <td>{{ rearport.positions }}</td>
+
+    {# Cable #}
+    <td>
+        {% if rearport.cable %}
+            <a href="{{ rearport.cable.get_absolute_url }}">{{ rearport.cable }}</a>
+        {% else %}
+            <span class="text-muted">Not connected</span>
         {% endif %}
+    </td>
 
-        {# Name #}
-        <td>
-            <i class="fa fa-fw fa-square{% if not cable %}-o{% endif %}"></i> {{ rearport }}
-        </td>
-
-        {# Type #}
-        <td>{{ rearport.get_type_display }}</td>
-
-        {# Positions #}
-        <td>{{ rearport.positions }}</td>
-
-        {# Cable #}
-        <td>
-            {% if cable %}
-                <a href="{{ cable.get_absolute_url }}">{{ cable }}</a> to <a href="{{ cable.far_end.device.get_absolute_url }}">{{ cable.far_end.device }}</a> {{ cable.far_end }}
-            {% else %}
-                <span class="text-muted">Not connected</span>
-            {% endif %}
-        </td>
-
-        {# Actions #}
-        <td class="text-right">
-            {% if perms.dcim.change_rearport %}
-                <a href="{% url 'dcim:rearport_edit' pk=rearport.pk %}?return_url={{ device.get_absolute_url }}" title="Edit port" class="btn btn-info btn-xs">
-                    <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
-                </a>
-            {% endif %}
-            {% if perms.dcim.delete_rearport %}
-                <a href="{% url 'dcim:rearport_delete' pk=rearport.pk %}?return_url={{ device.get_absolute_url }}" title="Delete port" class="btn btn-danger btn-xs">
-                    <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
-                </a>
-            {% endif %}
-        </td>
-    </tr>
-{% endwith %}
+    {# Actions #}
+    <td class="text-right">
+        {% if perms.dcim.change_rearport %}
+            <a href="{% url 'dcim:rearport_edit' pk=rearport.pk %}?return_url={{ device.get_absolute_url }}" title="Edit port" class="btn btn-info btn-xs">
+                <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
+            </a>
+        {% endif %}
+        {% if perms.dcim.delete_rearport %}
+            <a href="{% url 'dcim:rearport_delete' pk=rearport.pk %}?return_url={{ device.get_absolute_url }}" title="Delete port" class="btn btn-danger btn-xs">
+                <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
+            </a>
+        {% endif %}
+    </td>
+</tr>