moving towards baseless AMD, patch from Adrian Vasiliu (IBM, CCLA), fixes #16936 !strict