Backed out changeset 4b792c35d0be (bug 1041325) because of build bustage