Revert branch and commit changes because of Go modules versioning issue
This reverts merge request !219 (merged)