Backed out changeset 22c0fbb87b38 (bug 1065303) due to bc1 bustage