Revert "migrate to 'master' as adviced upstream"

This reverts commit c4d51947.

This change breaks master for all pacxx-related modules. Such a change should be made in a branch before merging to master, so unrelated work is not interrupted.

Will reintroduce this change in a branch, where it can be worked on until it is ready.