https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61536
--- Comment #5 from Paolo Carlini <paolo.carlini at oracle dot com> --- Thanks. Before reverting the whole thing, please see if something like the patchlet I'm going to attach works for you. It should.
