Subject: Applied in 842e0e439a22081be1b4fed7ddc21d6d228afd10

From: Andy Wingo <[email-masked]>
Date: Mon, 21 Aug 2017 09:16:59 +0200

Fixed by cherry-picking a patch from upstream; I followed up by removing
the function.

Andy