Revert part of 384364b (Start preparing for Git 2.0, 2014-03-07)