intent-based DSL restored again