Back out bug 940305 (too spammy)