This reverts merge request !685 (merged)
Reason https://issues.sonatype.org/browse/NEXUS-31214?focusedCommentId=1140935&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-1140935