r12743: Remove the ugly way we had to make a second stage init and introduce