Revert "Temp commit, these commited out repos messing with forall_vanir"

This reverts commit 7576e09ca9a88d1493949fb161f35b847522ac19.