Back out bug 922943 since it was misguided