Backed out changeset e9750b2a3e42 (bug 1102266) for B2G ICS bustage.