Revert "Cflag changes"

This reverts commit b3886648f3893a716600c62f43e6283249e397bd.