Backed out changeset e65b4f1bea88 (bug 948204) for bustage.