Merge "Remove bootstrapping the passthrough mount."