reverse macro logic to favor forward compatability