Revert "build: fix gcc 4.6.2 warnings"