Really get rid of the MSVC 2005 workaround completely
Merge pull request #698 from lioncash/missed-workaround

Really get rid of the MSVC 2005 workaround completely