This contain the fix for go 1.16 that we backported, so we can use
upstream repository again.

No effort has been made to keep data compatibility, updating instance
probably does not work