Incomplete work on fpco/gitlib#20