Merge pull request #15 from apache/NO-JIRA-Remove-workaround-for-resolved-INFRA-14923

[NO JIRA] Removed workaround for resolved INFRA-14923