Revert part of GCC warning fix to fix debug build.