Re-apply change to type initialization, whicht was overwritten during the rebase.