Patch Set 3:

I think this change can be made independent from the actual killing of the GitIndex. If you would rebase this change to master (instead of depending on change 4355) then we could accept this change before we have clarified whether we are allowed to kill GitIndex.