See my comment in the other commit about version handling.