Backed out changeset 30f7cbdcc2a1 (bug 845063) because of build bustage on a CLOSED TREE