Removed workaround for broken xml tags