Revert "init: Fix some more mergefails"

This reverts commit f85dcdbfa21a806cf2459158aae9cf8b9c24426c.