Temporary workaround for bug in VSM

Change-Id: Ib37c7a007acd8706cd563e30da428f0a9c8b479b