Roll back some more cflag funk

Change-Id: I6131576709cfcf06cc1b1c868dd0df4b7ac92207