Backout changeset 5e9b13c3595b (bug 1047621) because of bug 1053188.