Revert "More cflag optimizations"

This reverts commit 7adb29762897f540aa7a024cad663a7de7856e7e.