Temporary workaround for WFLY-1285