Revert "attempt to fix failing tests on clang"
Revert "attempt to fix failing tests on clang"

This reverts commit 3763596844528011c530fd72fc2b635dff2eb7fb.

manpen/thrill,manpen/thrill,manpen/thrill,manpen/thrill,manpen/thrill