Revert "Fix GCC 4.8 error"

This reverts commit d18d5d10c0e404926f078c3ee89a9b008ce9561c.

Change-Id: I9fc624143b0a4e7c6f17a964c710e1902c6004a2