bug 903039 - almost done