Revert "fix double init"

This reverts commit c4f8a8259069c50e738f4522266ec1f95ac96d3a.
Revert "Revert "fix double init""

This reverts commit d71f4a3ceb8d3901c64f4b09872bfe2f21ffdff4.
release