There needs to be more cleanup after this.
Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>