backed out the last change and re-did it the "right way" (bug 158372).