Revert "init: Fix some more mergefails"

This reverts commit 5487b074b9dfca1b564ca3955459c6e92f24aa66.