Fix contrib layout again.