Build error with gcc. This reverts commit 43855ccb. Change-Id: I45abc7ee0943b2ad7bd644c88858891fc7a38ead