Revert because applied with wrong JIRA number. This reverts commit 9c60c5fddbd9b1910fa59c44592249696948041a.