Revert "Fix narrowing conversion"

This reverts commit dde58481a9f2527518446ac5c8a65accd2423b38.
Fix various compiler warnings with gcc-4.7
Change-Id: Ia29ef35dc710721ec15d5e2cf849e027ae0e7724