This reverts commit c139279d47, reversing changes made to 4ed21047a7. We do want to do this but this broke bindings.
c139279d47
4ed21047a7