Revert "Fix build issue in assert mode introduced by 6427f4c5"

This reverts commit d65a3b32.
Breaks build everywhere, see e.g. http://45.33.8.238/linux/66344/step_4.txt
or https://lab.llvm.org/buildbot/#/builders/139/builds/16811