JAL-2805 undid accidental double (buggy) binding, more interface support