Merge "init: get rid of the remaining double mounts"