Enable compatibility with old api.

Remove namespace to enable serialization compatibility.