WFLY-1904 A bit more tweaking
WFLY-1904 A slightly different approach