Revert "Push remaining outstanding stuff to build Vanir"

This reverts commit 9af83b8b12131869c3a6079b92037327d843f40f.