Temporary workaround 2 for bug in VSM

Change-Id: I9aaf8d27e1979e1421bc4b1e0386bddfa2df58b1