From ubuntu vanilla