Reverted changes for adding at signs to attributes in xml