Revert "Compilation macro/conditional"

This reverts commit 4b37dda1b6ccf97e87a6b6a88cc0915666480407.