Workaround is no longer needed - relevant JIRA was verified