Fixes rebase issues on SSL branch.