This reverts commit 9efcfbed.

All the shame on me; this commit is actually causing more problems
(broken outputs but also crashes) than it was solving.