Backed out changesets 28df44ca24f3, 6a5406d79364 (bug 906134) for m-bc bustage