Revert "Remove clash for DEBUG symbol with other DEBUG directive"

This reverts commit 94bfb2bbf95c6529873dec77858fe3ac85d75597.