ffb189ed5a
This reverts commit c4dce0ae0f.
A different fix will be provided in a forthcoming patch.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>