[RFC 0/2] Get rid of _initializing_system_branch