Revert serializable change for now