Done in #45f6fe3