The previous "fix" was resulting in exceptions in some vdx files.

Change-Id: I961560b66bc29660daca54e39f14f612bbb50e34