Worked around XWIKI-9718