Revert "woops, i had a typo"

This reverts commit d9a280b1d97cf817d9bc8da87a087c25f68d620f.
Revert "optimizing XMLs"

This reverts commit f91b234984cdbe80dc937aa43586a9d18d75ceab.