Reverted change for VSA fix

Not sure what happened here.  The previous change seemed to fix an issue
but later broke again.  The original code should have been right.