Backed out changeset 3fde6fc99b0a (bug 1020368) for non-unified bustage.