Reverting last change so we don't have to think about the assert macro

redefinition problem.