This reverts commit 909b439b03. For some strange reason, the test suite crashes when compiled with GCC.
909b439b03