Backed out changesets fb6af789bc67 and 313123f12e95 (bug 818307) for non-unified bustage.