Revert "Fix compiler warnings"

This reverts commit fb0d3e6e676c478e5c934821527d12945cdf553c.