This reverts commit e0c7ba40.

Valgrind complains about invalid reads, which generate segfaults in some
systems.