Revert most of the pch/vs stuff