Created attachment 84675 [details] [review] temporary workaround patch Here's a temporary workaround patch. Not for merging, obviously.