revert 3644f1b temporary since it caused SEGV only on Travis-CI