Revert "Avoid double binding of change event"

This reverts commit 1faf0ee28ff1b1fb214f4e624be3620fe2d8271d.