avoid conflicts due to if defined usage
Revert "avoid conflicts due to if defined usage"

This reverts commit 7f78d6ddc152250d4945dfd5a9ad9ef4a9676dcc.
Merge pull request #1 from meltwater/master

Master