Xfail bug 920700, cleanup