Backed out changeset 22347f9e52cd (bug 989890) for bc1 testfailures