Pre-Git take two