remove gcc 4.8 changes

Change-Id: Iec7773d3f63643ef360b39167db28a98fd128469