re-enable bind hybrid support
minimize changes