> Looks like the patch from bug#64274 was attached instead.

Ah, sorry. Here is the correct patch.

Wilhelm