Revert back from gnu11