I regressed here when patching this. Here's the fix. Would be beautiful to have hardware to run end-to-end testing on. If you want to sponsor this, please let me know!