This reverts commit 6b1f66643d. It turns out to not really fix the build errors after all, so revert it. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6b1f66643d