Revert "Address bug 2187 and also minor xml changes."

This reverts commit e8330dda934d4c496c4d433a78064178c0f45510.