Revert "Fix warnings on gcc 4.4"

This reverts commit b1beb11a453c7e4acec7dc6743144b2af3393c76.