add @Remove to circumvent WFLY-817