Revert "Fix warnings when compiling with stricter warning flags"

This reverts commit 7e1d2331f206a6ef646a66068e98b3b99dd7e2e1.