move stuff around; bug 971017