Revert "Merge branch 'NoVist'"

This reverts commit 16c4bf4247b719d9bbb3acf130c7a9b53ad03b98, reversing
changes made to 9398502484f0ce1e069a860bee1f128d2bbf01c1.