[dev] switch back to legacy layers