Revert "m7: init: cleanup"

This reverts commit 98f8d09f2dc50117f71038106883954b0bc21cd3.