Backed out changeset a11adf1705ec (bug 982842) for causing bug 1075387