This reverts commit bc6532c3.

There are still too many packages relying on the XML files,
so for now the removal is reverted to allow for more time
for this transition.