Remove workaround for GCC PR 49829.