Fixes #2781, fixes #2782. Reverting to old method of instance method binding.