2c60bcb1c2
This reverts commit 9ce913a7bf720944d0305960bbf1899461b8628b. Reverting because of missing Jira-ID in the commit message