Revert data binding fix that breaks tests until tests can be investigated/fixed.