Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[Peter: drop Makefile changes]
(cherry picked from commit 863761ff3c6233e6e2ef836c4600590dc0d38197)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>