This reverts commit eac1a54857. This patch caused the builders to blow up. Signed-off-by: John Crispin <john@phrozen.org>
eac1a54857