Revert "Merge remote-tracking branch 'xwiki/master'"

This reverts commit 4925af05f5ce01dc53d1c19e61a88b984f6d06bc, reversing
changes made to e0bc1f1283af671d692394ab32321b3dcd4869d9.