GCC 4.8 can't handle it correctly. This reverts commit 5324dc89. Change-Id: I2478a52f147b585658d0e5769c3fce7f2c75240e