Revert "Bring flo|deb|mako back home to Vanir"

This reverts commit 6ce18e0c3b0681131b7f4cb1754ee4029e3de6ff.