Revert topic compile-defs-debugging.
Merge topic 'compile-defs-debugging' into next

ac89a78 Revert topic compile-defs-debugging.