I'll open a new issue for this to avoid losing track.