I implemented our own versions of the macros in 527041e so we can enable them conditionally. This "fixes" the issue and seems nicer for everyone.
With this, we might (or might not) want to revert a2d41c5 which is kinda pointless now.

—
Reply to this email directly or view it on GitHub.