Revert "Merge branch 'master' into repo-with-older-versions"
Revert "Merge branch 'master' into repo-with-older-versions"

This reverts commit 79621428bf6bb1edd325080cc07313e02992ab83, reversing
changes made to 602b49d386eef7a3b7f9c7a9987576c2502c2b8d.

junovitch/pkg,khorben/pkg,khorben/pkg,Open343/pkg,khorben/pkg,en90/pkg,skoef/pkg,en90/pkg,skoef/pkg,Open343/pkg,junovitch/pkg