Moved bootstrap logic back to client core