Manually revert @thet's commit 8946b02f43cc474c22589b49660680f1d48e1ba4 since it broke the build.