This reverts commit ded79be6. It causes a crash (I sent the crash reproducer directly to the author).