Revert "macros remove NOTECREATE"

This reverts commit b821a76d430fe0623a4f9f2d0cfbf81479a1f022.