Revert "reorder xml"

This reverts commit 9d0dfd871987e740964174d33a05b120e0ff8913.