revert this breaks build when building with gcc 4.7

Change-Id: I8f803777ec51419264275883421952dcd808332d