Revert changes to setUpTwoWayBinding because it breaks a test added in 4fe4f0fc