Fix git ref; remove obsolete workaround