Revert attempted work around for Visual C++.

[SVN r86478]