[1.1] Ensure serialization logic is compatible with JBoss Marshalling