fb030f3239
This reverts commit ac4540dd8e2872b113a61107b0a4a66beeec8649. Reverting because of missing Jira-ID in the commit message.