Revert c176f98..5efc2ac

This rolls back to commit c176f98e7b118fb3f124be3de04fdf912869be2e.
New Vizi