Revert c++11 feature for better backward compatibility.

This c++11 feature was giving us problems on older builds.  Changing this fixes it.