More manual installation

Change-Id: Idc59a97e0e8b5e1cab680ed0c194398d14f88b28