seriously, though... this non-vanir tracking bullshit is ruining the feng shui

Change-Id: Ie60a5f61edd9c53f37237f0bc306aa65e7d6606e