[WFLY-1511] Quick and dirty workaround fix