XWIKI-10874:  Merge conflict on XWiki.XWikiPreferences when creating a new subwiki.

* Revert changes made by XWIKI-10561 since we have done XWIKI-10772 afterwards.