This reverts commit ce64b8d8. It is done
via moduleh tree as part of a larger cleanup.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>