Vanir 4.0 bitches

Change-Id: Ic81eb5210bbafaef5d1fdf38d310674506291bb6