The changes have been reverted prior to the release of 15.10.9 to avoid the regression XWIKI-22147 on the 15.10.x release. Further, this has also been reverted for 16.3.1 to fix XWIKI-22147. XWIKI-22155 has been opened to track the regression remaining for 16.4.0RC1.