Reverted some code that was using a new experimental binding syntax which was not fully implemented.