Revert unapproved commits
    
    All gcc-11 false positive diagnostics must be fixed in gcc itself,
    please don't push gcc bugs to innocent users.
    
    This reverts the following commits:
    5cf517f60870e79837d0a0aeb4569d798c760d70 (Work around gcc-11 false positive diagnostic)
    e4ee13ea3d39847e5d9ba7d54255e50da27de9b2 (Work around more gcc-11 false positive diagnostics)