Temp revert thinsg breaking forall_vanir

Change-Id: I7c62212bb71a2bce3e38e3f54f677e0fcf95f12b