Revert "Fix warnings on older GCC versions"

This reverts commit b188e8aa0b80b6ade0eadf5ef5e4f50d8fe6b707.