Merge "Revert "Move more clinit code to registration functions""