Resubmit for Git issue #235