This reverts commit c6d26b7f72.
The hack isn't needed anymore. No change in output compared to
the parent commit (except for hashes).
This reverts commit c6d26b7f72.
The hack isn't needed anymore. No change in output compared to
the parent commit (except for hashes).