Revert "viadeo specific modifications"

This reverts commit b22e99e3272f84107724bc5dff0965786aeeb97e.