Partially revert "Some compiler flags changes"

I thought these changes causes the bootloop to occur, but we had a fix now.