Revert "couple of minor tweaks to data binder"

This reverts commit 60907a3e765b0134585826f8eae703708d6ec92c.