This reverts commit 466a603b59. Due to the last 2 commits, this macro is now unused, and will probably never be used, so let's get rid of that for now.
466a603b59