Make pass on CI 2.