Subject: Reverted 7379049d

From: Mikael Djurfeldt <[email-masked]>
Date: Fri, 6 Dec 2024 10:39:57 +0100

I reverted 7379049d which solves the acute problem, but leave this bug for
Andy to close once he has had time to re-introduce 7379049d the way he
intended it.