This reverts commit c578542a.

Older distros (centos 7, ubuntu 14.04) use older git than required by
the reverted patch.