Revert "XWIKI-14485: Some missing macros compared to pre 9.5"
Revert "XWIKI-14485: Some missing macros compared to pre 9.5"

This reverts commit f7bf2c30e21af228f7b14c0714b579a7f8135a6d.

pbondoer/xwiki-platform,pbondoer/xwiki-platform,pbondoer/xwiki-platform,pbondoer/xwiki-platform,xwiki/xwiki-platform,xwiki/xwiki-platform,xwiki/xwiki-platform,xwiki/xwiki-platform,xwiki/xwiki-platform,pbondoer/xwiki-platform