Revert "Updated Data Binding"

This reverts commit 3a9020c984349f03431ab5cc3466bb2ebab39555.