vanirnice: keep it simple, stoopid

Change-Id: I382d3a0c91f3ce6274d4341180cfb193d32d98a8
Merge "vanirnice: keep it simple, stoopid" into jb42