Undo of temporary workaround 2 for bug in VSM

Change-Id: I07da6411cad5760927af470858f78b84adbc8e80