Merge "Revert "Remove __sinit and __sdidinit.""