Since we now have a general work around, this hack is not needed
anymore. This reverts commit 6f1a7b41Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>