reverts changes to adapt introduced in the previous commit
a correct fix for implicit macros