Vanir-ify #2

Change-Id: I3348bb971845c51e09ad0d7b2286704e777a9520