Revert to 0bd831a5c982.