Revert cert-chain change.
Update project to fix few problems.