Revert "Merge in a lot of VANIR fixes and improvements"

This reverts commit c566243cb3d4616ed6370961d3293081666eaefb.