Revert VVE pull request

On test purpose