Revert "Remove obsolete patch."

This reverts commit 8992a8107eee033a648244252695fecaf97669ec. After discussing
this with Robin further, we'll keep this patch in order to maintain
compatibility with the release34 tag.
Adapt 3.4 versions.