remove references to the builder; bug 961403