since we dropped gcc 4.6 a few days ago... no need for this workaround.