Revert "Updated bindings"

This reverts commit 1e9faac5c5e9c38be1e48bb1e18b793b49565da9.
Re-commit the updated bindings reverting some unwanted changes the other commit introduced.