Reverted to simpler CI config