Back out part of bug 940215 because of a problem detected by bug 941854