Revert "from viswa"

This reverts commit c03ca0ca2ed5599e4a89eb17823bec0a0c056c41.