Remove ion, use the one in core instead
Avoid compilation error on macro redefinition