[WFLY-3240] Implement workaround for WFLY-3044 without requiring a spec maintenance release