diff --git a/elements/td-item.html b/elements/td-item.html
index ad97216..ed49ebe 100644
--- a/elements/td-item.html
+++ b/elements/td-item.html
@@ -7,38 +7,27 @@
 			<label>{{item.title}}</label>
 			<button class="destroy" on-click="destroyAction"></button>
 		</div>
-		<input is="td-input" id="edit" class="edit" value="{{title}}" hidden?="{{!editing}}" on-td-input-commit="commitAction" on-td-input-cancel="cancelAction">
+		<input is="td-input" id="edit" class="edit" value="{{item.title}}" hidden?="{{!editing}}" on-td-input-commit="commitAction" on-td-input-cancel="cancelAction">
 	</template>
 	<script>
 		(function() {
-			var ENTER_KEY = 13;
-			var ESC_KEY = 27;
 			Polymer('td-item', {
 				editing: false,
 				editAction: function() {
 					this.editing = true;
-					// FIXME: Custom elements extended from <input> don't have
-					// <input> binding behavior.
-					// https://github.com/Polymer/polymer/issues/186
-					this.$.edit.value = this.title = this.item.title;
 					// schedule focus for the end of microtask, when the input will be visible
-					Platform.flush();
 					this.asyncMethod(function() {
 						this.$.edit.focus();
 					});
 				},
 				commitAction: function() {
-					// FIXME: Custom elements extended from <input> don't have
-					// <input> binding behavior.
-					// https://github.com/Polymer/polymer/issues/186
-					this.title = this.$.edit.value;
 					if (this.editing) {
 						this.editing = false;
-						this.item.title = this.title.trim();
+						this.item.title = this.item.title.trim();
 						if (this.item.title === '') {
 							this.destroyAction();
 						}
-            this.fire('td-item-changed');
+						this.fire('td-item-changed');
 					}
 				},
 				cancelAction: function() {