7b9787935a
This reverts commit 27dcfd3e04.
This was fixed in 3.14.2 and as such this patch application has become
obsolete.