WIP: investigating SI-8069

LGTM, thanks @adriaanm