Unfortunately the way it was implemented is very limited and broke various use cases, like XWIKI-11988...