Revert "Salomon branch"