Revert "Macro update"

This reverts commit 3bde80d72ac6d5595d98f8d2c522d769737aa95b.