Remove auto-flattening, its wrong