diff --git a/ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java b/ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java
index 1f2cb162f..b4268e63f 100644
--- a/ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java
+++ b/ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java
@@ -62,10 +62,10 @@ public abstract class AbstractMarshaller<P extends Portable> {
                 JacksonXmlModule module = new JacksonXmlModule();
                 module.setDefaultUseWrapper(false);
                 xmlMapper = new XmlMapper(module);
-                xmlMapper.registerModule(new JaxbAnnotationModule());
                 if (indentation) {
                     xmlMapper.enable(SerializationFeature.INDENT_OUTPUT);
                 }
+                //xmlMapper.registerModule(new JaxbAnnotationModule());
                 xmlMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
                 break;
 
diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/l10n/LocalizedString.java b/ccm-core/src/com/arsdigita/portation/modules/core/l10n/LocalizedString.java
index e067cb994..f447b0233 100644
--- a/ccm-core/src/com/arsdigita/portation/modules/core/l10n/LocalizedString.java
+++ b/ccm-core/src/com/arsdigita/portation/modules/core/l10n/LocalizedString.java
@@ -18,16 +18,13 @@
  */
 package com.arsdigita.portation.modules.core.l10n;
 
-import com.arsdigita.portation.modules.core.l10n.jaxb.LocalizedStringValuesAdapter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.util.*;
-
-import static com.arsdigita.portation.modules.core.l10n.L10NConstants.L10N_XML_NS;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * A helper class for localisable string properties. This class is declared as
@@ -38,11 +35,11 @@ import static com.arsdigita.portation.modules.core.l10n.L10NConstants.L10N_XML_N
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
  * @version created on 6/15/16
  */
-@XmlAccessorType(XmlAccessType.FIELD)
+//@XmlAccessorType(XmlAccessType.FIELD)
 public class LocalizedString {
 
-    @XmlElement(name = "values", namespace = L10N_XML_NS)
-    @XmlJavaTypeAdapter(LocalizedStringValuesAdapter.class)
+    //@XmlElement(name = "values", namespace = L10N_XML_NS)
+    //@XmlJavaTypeAdapter(LocalizedStringValuesAdapter.class)
     private Map<Locale, String> values;
 
     /**