Changes from Ben's dead git.