Backed out changeset 1dd103323b7c (bug 1112552) for bc1 bustage