my cherry-picks fix init, no need to copy a working one anymore