Backing out c133a03833b0 (bug 831693) - oranges