Revert d36b8fa..e9ad8bf

This rolls back to commit d36b8faa843dbde7cd5e9bbb81ec20209a398258.
Removed incorrect calls and upped version