This reverts commit c0918613, since it
triggered a new assertion with gcc.
This bug definitely needs a true proper fix.