Revert "it seems like we have to force it to do what we want..."

This reverts commit c96d1c7d5c0359aeb7fd6864d2ec2c26197de1e2.
this commit caused travis to make all builds with i586-mingw32msvc-gcc /
-g++, which is not what we wanted it to do.