XWIKI-17243 might also have a side effect: maybe it's a fix for this on 16.x but it's probably not a long term solution.