reverting oi-specific branding in 45a86ff .. f5083a6