Revert "FLEX-33874 improve binding performance"

This reverts commit ccdbfebd403b913c67d58b096f570d4c088fd0c1.