Redoing changes due to a git snafu.