Let's retest if this is still needed with issue #121 fixed.