Revert "mods from vanir"

This reverts commit 45a9040aef2549a82d9e272142698b88ac51bf76.