bug 1288: Some cleanup as this is never used anyway
Merge branch 'bug-1288' into testserver-stable