This reverts commit c9b8d580.

This is just a technical revert to make the printk fix apply cleanly,
this patch will be re-picked in about 3 commits.