am ad2494bb: Remove gcc 4.9 workaround.

* commit 'ad2494bb79932c4f2fd55f51e9b0d58676502558':
  Remove gcc 4.9 workaround.