Revert "Revert ad15c2, which causes Windows seg-faults (Trac #8834)"

Authored by austin on Apr 4 2014, 10:33 AM.