Reverted changes for VU  from pull request #192 since they aren't needed.