Revert "Merge branch 'pks-go-resolve-conflicts-default-enable' into 'master'"
This reverts commit 8e62ebd1, reversing changes made to 8df8c774 as it is causing failures in staging (see gitlab!58736 (closed))
This reverts commit 8e62ebd1, reversing changes made to 8df8c774 as it is causing failures in staging (see gitlab!58736 (closed))