Revert "Fix DEBUG=1 builds"

This reverts commit 6e76f7bc.

This patch tries to workaround a previous clang workaround. Instead of going
into workaround of workaround spiral, the original workaround should be tamed.