diff --git a/source/_patterns/02-components/table/table.hbs b/source/_patterns/02-components/table/table.hbs
index 50663fd657..0ffb0fa046 100644
--- a/source/_patterns/02-components/table/table.hbs
+++ b/source/_patterns/02-components/table/table.hbs
@@ -16,22 +16,12 @@
 		</tr>
 	</thead>
 	<tbody{{#if align}} data-align="{{ align }}"{{/if }}{{#if vertical-align}} data-vertical-align="{{ vertical-align }}"{{/if }}>
-		{{! TODO: Not elegant, but working for the moment… }}
-		{{#if rowtitle }}
-			{{#each cells }}
-				<tr>
-					<th scope="row">table header</th>
-					<td{{#if @first }}{{#if ../icon}} data-icon="{{ ../icon }}"{{/if }}{{/if }}>{{{ text01 }}}</td>
-					<td>{{{ text02 }}}</td>
-				</tr>
-			{{/each }}
-		{{else}}
-			{{#each cells }}
-				<tr>
-					<td{{#if @first }}{{#if ../icon}} data-icon="{{ ../icon }}"{{/if }}{{/if }}>{{{ text01 }}}</td>
-					<td>{{{ text02 }}}</td>
-				</tr>
-			{{/each }}
-		{{/if }}
+		{{#each cells }}
+			<tr>
+				{{#if ../rowtitle }}<th scope="row">table header</th>{{/if }}
+				<td{{#if @first }}{{#if ../icon}} data-icon="{{ ../icon }}"{{/if }}{{/if }}>{{{ text01 }}}</td>
+				<td>{{{ text02 }}}</td>
+			</tr>
+		{{/each }}
 	</tbody>
 </table>