[jboss-jira] [JBoss JIRA] (ELY-1411) Revert fix for ELY-1380