This reverts commit 2109a48e18719383942d535ff4c1d0a859dcc424. Conflicts: src/main/scala/converters/Nasti.scala